Commit Graph

3933 Commits

Author SHA1 Message Date
TullyBurnalot
ca65b591d8 Addresses Fox Issues 2017-05-18 11:41:56 +01:00
TullyBurnalot
29b0b372fa Fixes Deaf Listening 2017-05-18 10:35:05 +01:00
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
FlattestGuitar
fa4f4246ed Adds radios and prisoner IDs to prisoner lockers 2017-05-13 23:40:19 +02:00
Fox-McCloud
bbd306d60f fix 2017-05-13 07:23:56 -04:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Fox McCloud
cc703a4882 Merge pull request #7249 from Crazylemon64/radio_gc_fix
Radios no longer double-dip initialize 4noraisin
2017-05-07 06:03:58 -04:00
Sam
9e30dfbdf7 Holy whip now references the station 2017-05-07 09:10:59 +01:00
Crazylemon64
6c8a20a825 Radios no longer double-dip initialize 4noraisin 2017-05-06 23:41:59 -07:00
Fox McCloud
8d4cc7b645 Organ and Autopsy Qdel Fixes and Minor Organ Tweaks (#7201)
* Organ and Autopsy Qdel Fixes

* organ tweaks

* tweaks
2017-05-06 15:26:45 -07:00
Fox McCloud
12c4b2933c Hydro and Bees GC fixes (#7221)
* Hydro and Bees GC fixes

* more shit
2017-05-06 15:01:36 -07:00
Alffd
a662a48794 Don't step on glass (#7223) 2017-05-06 14:58:32 -07:00
Fox McCloud
9a43700e5d Makes All Instances of Implanting Use Proper Procs (#7224) 2017-05-05 15:45:37 -07:00
Fox McCloud
36d4298e2b Merge pull request #7198 from Crazylemon64/organ_varname_refactor
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-30 17:00:44 -04:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
scrubmcnoob
329fba9f14 Requested Changes
All the changes requested.
2017-04-29 21:58:27 -04:00
scrubmcnoob
20c4384828 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2017-04-29 19:42:10 -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
d1f43dbd9a Dresser is constructible and moveable. 2017-04-23 02:41:01 +01:00
Crazy Lemon
67f72b2791 Merge pull request #7109 from Lady-Luck/syndibundles
Syndicate Bundle Adjustments
2017-04-21 09:25:38 -07:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Sam
88252397c2 Spelling/Grammar fixes in the occult 2017-04-18 20:06:35 +01:00
Krausus
4572ad6af4 Fixes matchboxes lacking storage limitations 2017-04-16 22:53:03 -04:00
Lady-Luck
b9274b6654 Reverts removal of the uplink implant to the implant bundle, instead just removes EMP and Microbomb. 2017-04-16 14:57:31 -05:00
Lady-Luck
e767fdab8a Changes the two red energy swords into a red double-bladed energy sword (reverted from commit 46d4c5b9c7) 2017-04-15 17:05:22 -05:00
Lady-Luck
46d4c5b9c7 Changes the two red energy swords into a red double-bladed energy sword 2017-04-15 16:19:01 -05:00
Lady-Luck
0d1179a54a Adjusts syndicate bundles, adds Allies Cocktail object for bond bundle 2017-04-15 16:01:09 -05: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
e9156ef71b Merge pull request #7036 from FlattestGuitar/desolate-fluff
Adds a fluff item for DesolateG 👌
2017-04-11 19:52:14 -04: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
FlattestGuitar
c73eb10c1b Adds a fluff item for DesolateG 2017-04-12 00:41:20 +02:00
Crazy Lemon
ff271f7b29 Merge pull request #7061 from Fox-McCloud/damn-cells
Damn cells
2017-04-09 13:55:30 -07:00
Crazy Lemon
cc649db525 Merge pull request #6894 from Fox-McCloud/abductor-hearts
Abductor Gland Rework and Abductor Updates
2017-04-09 13:40:01 -07:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
Fox-McCloud
d07f49433a oh, this is what you meant.... 2017-04-06 06:38:28 -04:00
Fox-McCloud
ec223e040e fixes 2017-04-06 06:37:18 -04:00
Crazy Lemon
23180656c0 Merge pull request #7050 from Fox-McCloud/autopsy-fix
Fixes+Refactors Autopsy Scanner Printing
2017-04-06 00:04:28 -07: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
ab5cab5af7 tweak 2017-04-05 23:46:53 -04:00
Fox McCloud
61eff3aa1f Merge pull request #7051 from SamHPurp/light-cigs-with-fireballs
Enables lighting cigarettes with Wands of Fireball
2017-04-05 19:11:34 -04:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Sam
4fc96b7d21 Wizards always succeed
By request of Fox.
2017-04-05 00:59:04 +01:00
Sam
89f10e834c boom 2017-04-04 23:46:55 +01:00
Fox-McCloud
2205c14b7d Fixes+Refactors Autopsy Scanner Printing 2017-04-04 18:13:35 -04:00
Fox-McCloud
8fb17b2bee moarrr 2017-04-04 04:26:53 -04:00
Fox-McCloud
9a20311152 better QDEL_NULL 2017-04-04 00:35:42 -04:00
Fox-McCloud
fb02933f30 For qdel and Destroy Fixes 2017-04-03 19:06:20 -04: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
Fox-McCloud
35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00