Commit Graph

6408 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
Sam
dab3188c3c fixes Contraband poster issues 2017-05-17 00:57:59 +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
TravellingMerchant
d2d1af7270 defines posters 2017-05-16 01:33:47 +01: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
Fox McCloud
fc46a2c5a2 Merge pull request #7271 from Aurorablade/CultBugs
Fixes more cult bugs
2017-05-13 17:51:19 -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
20ab3ee64d Makes Clothing Accessories, Clothing with Accessories, Blood, and Spiderlings GC (#7272)
* Makes Clothing Accessories and Clothing with Accessories GC

* and spiderlings, apparently

* BLOOOD FINALLY GARBAGE COLLECTS!!!!
2017-05-11 18:50:43 -07: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
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
818ca57be6 Byond's grammatical helper thing is cool 2017-05-07 09:20:11 +01:00
Sam
9e30dfbdf7 Holy whip now references the station 2017-05-07 09:10:59 +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
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
Crazy Lemon
bb93c95067 Merge pull request #7192 from Fox-McCloud/destroyssss
Fixes More Destroys
2017-04-29 15:43:42 -07:00
Fox-McCloud
e32f6c997d Fixes More Destroys 2017-04-29 03:35:56 -04: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
Fox McCloud
153de130f4 Merge pull request #7130 from FalseIncarnate/bugfix
Allows scythes to mass-clear glowshrooms
2017-04-26 00:10:26 -04:00
FalseIncarnate
f7c76befff Variable rename and operator change
Changes the variable name to avoid confusion, and changes the math to
use the *= operator.

Also does the same for the spacevines, for consistency.
2017-04-25 23:55:40 -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
FalseIncarnate
f8b5a7025e Fixes folded tele-scythes not doing ANY damage
I knew that return was there for a reason...
2017-04-21 16:03:04 -04:00
Crazy Lemon
327f89c890 Merge pull request #6950 from Fox-McCloud/tesla-tweaks
Tesla Update
2017-04-21 09:52:23 -07:00
Crazy Lemon
67f72b2791 Merge pull request #7109 from Lady-Luck/syndibundles
Syndicate Bundle Adjustments
2017-04-21 09:25:38 -07:00
FalseIncarnate
faf0567774 Allows scythes to mass-clear glowshrooms
Glowshrooms are no longer immune to the reaper's touch, and will be
shredded by scythes just like vines.
2017-04-19 15:42:14 -04:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Crazy Lemon
18ffff09f4 Merge pull request #7026 from warior4356/Virtual-Avatars
VR Phase #1
2017-04-18 21:25:35 -07:00
Sam
7be3d5baf6 Enables more burnable wood objects 2017-04-18 20:06:47 +01: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
Fox McCloud
84885f1efa Merge pull request #7007 from uraniummeltdown/glass
Heat Proofing Glass Airlocks
2017-04-16 17:55:10 -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