Skip to content

Drone Pickups #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stinkysmellystinkysmelly wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Drone Pickups #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
613a4f4
Fixed drones being able to pick up hand labelers and pens.
stinkysmellystinkysmelly Nov 13, 2014
d83e590
Fixed a bug where drones could pick up pens and hand labelers to comm…
stinkysmellystinkysmelly Nov 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions NTstation13.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,48 @@

// BEGIN_FILE_DIR
#define FILE_DIR .
#define FILE_DIR "html"
#define FILE_DIR "icons"
#define FILE_DIR "icons/ass"
#define FILE_DIR "icons/effects"
#define FILE_DIR "icons/mecha"
#define FILE_DIR "icons/misc"
#define FILE_DIR "icons/mob"
#define FILE_DIR "icons/obj"
#define FILE_DIR "icons/obj/assemblies"
#define FILE_DIR "icons/obj/atmospherics"
#define FILE_DIR "icons/obj/clothing"
#define FILE_DIR "icons/obj/doors"
#define FILE_DIR "icons/obj/flora"
#define FILE_DIR "icons/obj/machines"
#define FILE_DIR "icons/obj/pipes"
#define FILE_DIR "icons/obj/power_cond"
#define FILE_DIR "icons/pda_icons"
#define FILE_DIR "icons/spideros_icons"
#define FILE_DIR "icons/stamp_icons"
#define FILE_DIR "icons/Testing"
#define FILE_DIR "icons/turf"
#define FILE_DIR "icons/vending_icons"
#define FILE_DIR "nano"
#define FILE_DIR "nano/images"
#define FILE_DIR "sound"
#define FILE_DIR "sound/AI"
#define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/effects"
#define FILE_DIR "sound/hallucinations"
#define FILE_DIR "sound/items"
#define FILE_DIR "sound/machines"
#define FILE_DIR "sound/mecha"
#define FILE_DIR "sound/misc"
#define FILE_DIR "sound/piano"
#define FILE_DIR "sound/violin"
#define FILE_DIR "sound/voice"
#define FILE_DIR "sound/voice/complionator"
#define FILE_DIR "sound/vox_fem"
#define FILE_DIR "sound/weapons"
#define FILE_DIR "tools"
#define FILE_DIR "tools/AddToChangelog"
#define FILE_DIR "tools/AddToChangelog/AddToChangelog"
// END_FILE_DIR

// BEGIN_PREFERENCES
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/simple_animal/friendly/drone.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
return 1

/mob/living/simple_animal/drone/UnarmedAttack(atom/A, proximity)
if(istype(A,/obj/item/weapon/gun))
if(istype(A,/obj/item/weapon/gun) | istype(A,/obj/item/weapon/hand_labeler) | istype(A,/obj/item/weapon/pen))
src << "<span class='warning'>Your subroutines prevent you from picking up [A].</span>"
return

Expand Down
11 changes: 10 additions & 1 deletion html/changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,16 @@

<!-- You can simply add changelogs using AddToChangelog.exe -->

<!-- DO NOT REMOVE OR MOVE THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
<!-- DO NOT REMOVE OR MOVE THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->

<div class='commit sansserif'>
<h2 class='date'>13 November 2014</h2>
<h3 class='author'>Bobder updated:</h3>
<ul class='changes bgimages16'>
<li class='bugfix'>Fixed drones being able to pick up hand labelers and pens to communicate with players.</li>
</ul>
</div>


<div class='commit sansserif'>
<h2 class='date'>17 August 2014</h2>
Expand Down