FlattestGuitar
fa4f4246ed
Adds radios and prisoner IDs to prisoner lockers
2017-05-13 23:40:19 +02:00
Markolie
d9653c79f5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
...
# Conflicts:
# code/game/machinery/recharger.dm
# code/game/objects/items/devices/autopsy.dm
# code/game/objects/items/devices/modkit.dm
# code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Sam
932cae0224
Loyalty implant -> Mindshield Implant
2017-04-09 16:50:51 +01:00
Mark van Alphen
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
Sam
8965ba9872
Misc grammatical fixes
...
Adds message to let people know when you're trying to yank out objects
from them
2017-03-27 06:16:24 +01:00
Mark van Alphen
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
KasparoVy
1c556648c6
Keeping up with the Jones.
...
Nukeproof fridges.
2017-03-19 05:49:07 -04:00
Mark van Alphen
06b3460d6e
Merge branch 'master' into findnreplace
2017-03-15 16:02:14 +01:00
uraniummeltdown
9eb7eea1e9
removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA
2017-03-10 22:46:02 +04:00
Mark van Alphen
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
Mark van Alphen
93470e3570
Merge branch 'master' into zefix
2017-03-09 17:20:31 +01:00
Markolie
acab5d5170
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
...
# Conflicts:
# code/game/objects/items/weapons/storage/bags.dm
# code/game/objects/items/weapons/storage/uplink_kits.dm
# code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
Mark van Alphen
b26d50d9f9
Merge branch 'master' into findnreplace
2017-03-08 10:37:10 +01:00
Fox McCloud
f96c335d1f
Merge pull request #6704 from uraniummeltdown/hardsuit
...
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
uraniummeltdown
dc6f9f5506
rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands
2017-03-07 20:55:43 +04:00
Markolie
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
Markolie
ceb14ef15d
Fix NODROP interaction with secure closets
2017-03-06 13:34:05 +01:00
Fox-McCloud
41d4c83f17
Refactors Money
2017-03-06 04:52:03 -05:00
Mark van Alphen
b0ded4b821
Merge branch 'master' into findnreplace
2017-03-05 12:09:52 +00:00
Crazy Lemon
5e1bd050f8
Merge branch 'master' into adminin
2017-03-03 23:23:40 -08:00
uraniummeltdown
0c7ec9d330
Merge remote-tracking branch 'remotes/upstream/master' into statues
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-27 14:27:24 +04:00
Markolie
6982014a6e
Replace all BYOND text macros
2017-02-21 15:41:37 +01:00
Markolie
481083dfca
Variable fix
2017-02-21 13:49:00 +01:00
Markolie
a23493af86
Remove as obj
2017-02-21 13:43:37 +01:00
Markolie
389890bb2d
Additional admin interaction additions
2017-02-21 13:26:18 +01:00
Sam
d3e3ed24a4
Dethrones captain, adds crown to hat crate
...
Removes crown from Captain locker & adds to collectible hat crate
2017-02-20 12:53:12 +00:00
uraniummeltdown
7628586ee6
adds mineral statues from TG, added statue recipes for minerals, breakdown sandstone->sand
2017-02-19 21:48:13 +04:00
Crazy Lemon
e89bbcd9c1
Merge pull request #6330 from FlimFlamm/box_sprite_addition
...
Large Cardboard Box Decals/Sprites
2017-02-14 23:12:41 -08:00
uraniummeltdown
3df3688e72
move all crates to crates.dmi
2017-02-11 17:44:20 +04:00
FlimFlamm
ebed2adc55
This commit updates the name of the new "cardboard_boxes.dmi" file (from boxes.dmi) to prevent future confusion with regular boxes.
2017-02-09 02:08:41 -04:00
FlimFlamm
c14cab9a69
This commit changes the re-sprite mechanic to use a pen instead of crayonbox (as per the convention pointed out by Fox). Removes no longer needed contents checks and re-orders incapacitation check.
2017-02-08 15:12:56 -04:00
FlimFlamm
2abbbc7a40
This commit removes the loop used to check contents and instead uses W.contents.len in order to compare the ccurrent number of items in the crayon box against it's max storage capacity (6) to ensure the crayon box is full. Also better usage of returns in order to preserve indentation on code and make it more readable.
2017-02-08 10:08:07 -04:00
FlimFlamm
47427c5aec
This commit adds checks to make sure the box is filled with 6 crayons (of any subtype) before the input selection window is presented, and after a choice is made (to prevent people using crayon-less boxes)
2017-02-08 00:26:26 -04:00
FlimFlamm
6ede4c9ef8
This commit improves again the legibility of the list of decal options presented to the user, fixes a minor syntactical error involving ampersands, and deletes superfluous returns at the end of attackby proc.
2017-02-07 03:22:29 -04:00
FlimFlamm
25f5df4ba3
This commit adds adjacency check, item-still-in-hands check, now properly handles null input, and consumes the crayon box upon completion. Everything compiles, and everything works on local environment.
2017-02-06 22:04:36 -04:00
FlimFlamm
4666222ab5
This commit adds a cancel option to the decal selection list and spruces up the names to make them more legible
2017-02-05 23:24:50 -04:00
uraniummeltdown
6f774c8e1e
added engi+engisec, electric engi from TG and sci+scisec crates from /vg/
2017-02-05 19:22:07 +04:00
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
FlimFlamm
d01e4c3023
readds a forward slash which was removed in error
2017-02-04 21:51:22 -04:00
FlimFlamm
7432e80d51
This commit modifies cardboardbox.dm in order to have boxes pull sprites from the ew DMI file, and also to trigger the re-spriting option when open boxes are struck with a box of crayons.
2017-02-04 16:25:42 -04:00
Mark van Alphen
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
Chakirski
f39fe8ab75
muh future
2017-02-01 21:29:04 -06:00
Chakirski
812c2db2fe
closets
2017-01-31 19:14:31 -06:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Markolie
01f2c85347
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/game/dna/genes/goon_powers.dm
# code/game/dna/genes/vg_powers.dm
# code/game/objects/effects/overlays.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/statue.dm
# code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
# icons/mob/back.dmi
# icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
Crazylemon64
c0cd2c263f
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Fox McCloud
f205f5f040
Merge pull request #5915 from Twinmold93/runtime_fixer_t2
...
Spacepod and Some Runtime Fixes
2016-12-01 10:15:51 -05:00
Twinmold
ada80ec529
Pod Fixes and Some Runtime Fixes
...
Fixes sending pod pilots to the void when the pod explodes/is destroyed,
as well as giving them damage warnings, just like passengers get. Also
fixes it so if a guardian traps something, then dies, doesn't runtime.
Lastly, fixes it so there isn't a randomly runtime from opening a
critter crate, as well as cleaning up a little snowflake code, thanks to
Crazylemon.
2016-11-26 05:37:31 -06:00
