Commit Graph

1271 Commits

Author SHA1 Message Date
Fox McCloud
146e3a6540 Merge pull request #7305 from FlattestGuitar/brigerino-kekerino
Adds radios and prisoner IDs to prisoner lockers
2017-05-16 06:47:44 -04:00
Fox McCloud
195a907ffe Merge pull request #7123 from SamHPurp/Fixes
Fixes
2017-05-15 19:21:01 -04:00
Crazy Lemon
fc28a3e27c Merge pull request #7297 from Fox-McCloud/more-gc-defines
More GC Define Transitions
2017-05-13 16:22:06 -07:00
FlattestGuitar
fa4f4246ed Adds radios and prisoner IDs to prisoner lockers 2017-05-13 23:40:19 +02:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Aurorablade
63f72a29be girders 2017-05-11 00:15:15 -04:00
Sam
5e6ae560d6 Fixing errant reference 2017-05-07 23:10:13 +01:00
Sam
818ca57be6 Byond's grammatical helper thing is cool 2017-05-07 09:20:11 +01:00
Twinmold93
acf9d1efcb Fixes Deep-Fried Grabs and Display Case Grabs (#7240)
* Fixes Grab's on Lethal Kitchen

Fixes the issue that I didn't have in testing. Fixes #7239

🆑 Twinmold
Fix: No longer able to cook grabs.
/🆑

* Fixes Display Case

Fixes #7212

* Changes Display Case to use ABSTRACT

So you can't put Ei'Nath into the case... Also, you already can't put
things like that in the deep fryer/other kitchen equipment, so that's
good.
2017-05-07 00:08:37 -07:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
uraniummeltdown
443d577871 allows construction of wood and rough iron (metal rod) walls and false walls, girder construction uses defines, screwdriver displaced girder to deconstruct, examine a girder for (de)construction hints, projectiles have a chance of passing thru girder,changed girder health values, false wall construction takes time (2s) 2017-04-27 11:42:31 +04:00
uraniummeltdown
53447ef17b new runed girder icon from tg, harvesters can summon cult walls and floors and enviro smash set to 3, made cult girders a subtype of girder, fixed girder subtype names, fixed adding runed metal to runed girder not working, summoned cult walls do not drop girder or runed metal 2017-04-24 21:30:08 +04:00
Sam
6316f945d0 Uses [src] instead of [name] 2017-04-23 06:26:43 +01:00
Sam
99421f72d3 Oh, and deconstructed. 2017-04-23 03:06:07 +01:00
Sam
d1f43dbd9a Dresser is constructible and moveable. 2017-04-23 02:41:01 +01:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Sam
7be3d5baf6 Enables more burnable wood objects 2017-04-18 20:06:47 +01:00
Fox McCloud
84885f1efa Merge pull request #7007 from uraniummeltdown/glass
Heat Proofing Glass Airlocks
2017-04-16 17:55:10 -04:00
FlattestGuitar
8978f1e530 Fluffpocalypse 2017-04-15 22:05:15 +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
Fox McCloud
0edc5400b3 Merge pull request #7080 from SamHPurp/loyalty-to-mindshield
Refactors any remaining Loyalty references to Mindshield
2017-04-11 19:50:59 -04:00
Sam
e291a7ec6f Fixes 7082 2017-04-10 01:10:20 +01:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
Crazy Lemon
f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull
Converts Most Destroys to use QDEL_NULL
2017-04-05 23:49:19 -07:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Sam
88ec05be4e Couple typos and a gramatically tweak 2017-04-04 14:27:22 +01:00
Crazy Lemon
c6abe7822b Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs
Garbage Collection and Code Cleanup
2017-04-01 22:58:52 -07:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Fox McCloud
f83b48f26a Merge pull request #6997 from Crazylemon64/ghostbeacon_rerouting
Allows rerouting of ghost beacons
2017-04-01 17:46:22 -04:00
Fox McCloud
7668c79e7c Merge pull request #7006 from KasparoVy/windowner
Window Corridor Thrown Objects Fix
2017-04-01 17:39:28 -04:00
uraniummeltdown
2f54ed86a2 airlock assemblies can be heatproofed by adding rglass during construction, blast/pod doors + shutters have heat_proof = 1 2017-03-31 16:13:25 +04:00
KasparoVy
3aa4cefad8 Window Corridor Thrown Objects Fix
Thrown objects that cross a tile with non-full windows will no longer hit the window even if it isn't visually obstructing the path.
2017-03-31 04:50:56 -04:00
Fox McCloud
f821749086 Merge pull request #6777 from uraniummeltdown/tesla
Tesla Grilles
2017-03-30 21:24:21 -04:00
Crazylemon64
2165d5db6f Allows rerouting of ghost beacons 2017-03-30 03:16:06 -07:00
Fox-McCloud
50051ee851 Garbage Collection and Code Cleanup 2017-03-27 18:37:44 -04:00
Sam
54de887b6c Removing superfluous override 2017-03-27 09:14:24 +01:00
Sam
8bdd31c4c2 Latest batch of fixes - bad ❄️ 2017-03-27 09:01:36 +01: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
Sam
7dc3b9388b Resolves Fox's concerns (Hopefully) 2017-03-27 04:10:57 +01:00
Sam
0b7a95933c Refactors bed/chair/stool deconstruction + more
Add psych bed... fixes typos... fixes inconsistent deconstruction
amounts
2017-03-26 15:50:49 +01:00
Sam
fbd7edd7f3 Comment following discussion 2017-03-26 06:59:50 +01:00
Sam
4987aac15c Wooden chairs break into wood not metal 2017-03-25 02:29:58 +00:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Fox McCloud
2844a024ab Merge pull request #6853 from KasparoVy/stuff
Fixes #6842, #6840 and #6839
2017-03-22 17:17:32 -04:00
KasparoVy
1cbe9d0bb6 Beds now return 2 metal when deconstructed.
Removes unnecessary src.
2017-03-21 16:45:55 -04:00
Fox McCloud
9444666c18 Merge pull request #6818 from KasparoVy/deadlier-nuke
Nuke kills everybody (On the station Z-level).
2017-03-21 15:08:54 -04:00
Fox McCloud
472bd7b887 Merge pull request #6813 from SamHPurp/fixes-vent-text
Fixes
2017-03-20 16:39:10 -04:00
Sam
e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
KasparoVy
1c556648c6 Keeping up with the Jones.
Nukeproof fridges.
2017-03-19 05:49:07 -04:00
Sam
3b166bcb97 Fixes formatting issue ( Thanks @Tigercat2000 ) 2017-03-19 04:29:18 +00:00