Fox McCloud
9ffc341f49
Merge pull request #5274 from TheBeoni/Coats
...
Removes the obligatory tie from Blueshields and Detectives coat.
2016-08-02 13:48:13 -04:00
Fox McCloud
db066016b2
Merge pull request #5273 from LittleBigKid2000/mourning-wood
...
Fixes wooden coffins deconstructing into metal sheets
2016-08-02 12:56:33 -04:00
Fox McCloud
dbd1cdb35a
Merge pull request #5269 from GeneralChaos81/AtmosLockers
...
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
2016-08-02 12:55:54 -04:00
Krausus
dba8af8ab5
Removes dels and unused code that contains dels
2016-08-02 01:33:19 -04:00
Isaac Erwin
692e961e2f
Fixes wooden coffins deconstructing into metal sheets
...
Sure, I /could/ fix the messages and the fact that a wooden coffin is
deconstructed with a welder, but just think of it as slicing the hinges
apart because I'm too lazy.
Also makes sarcophaguses deconstruct into sandstone, but I don't think
I've ever seen those in-game.
🆑
fix: Coffins will now deconstruct into wood instead of metal.
/🆑
2016-08-01 23:05:50 -04:00
Fox-McCloud
2e69b0eec1
Removes More Del's
2016-08-01 21:24:38 -04:00
TheDZD
bc98945c7a
Merge pull request #5177 from Fox-McCloud/medical-stack-rework
...
Trauma and Burn Kit Rework
2016-08-01 21:03:07 -04:00
TheDZD
8e9850d76a
Merge pull request #5222 from Crazylemon64/json_serialization2
...
Lets you convert people to text and back again
2016-08-01 20:55:08 -04:00
Fox McCloud
f0531860d4
Merge pull request #5264 from tigercat2000/seriously_fox
...
Refactor stack recipes
2016-08-01 20:44:37 -04:00
TheDZD
0cc2051f8a
Merge pull request #5251 from Fox-McCloud/fire-system
...
Implements Fire System
2016-08-01 19:39:50 -04:00
TheBeoni
67836ab234
Adds black tie to detectives locker.
2016-08-01 22:12:16 +02:00
GeneralChaos81
7c7d63b05f
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
2016-08-01 16:25:50 +10:00
Fox McCloud
31ad2a84f2
Merge pull request #5132 from Kyep/atmos_grenades
...
Atmos Grenades (aka: how to kill people with atmos)
2016-07-31 22:40:03 -04:00
Crazylemon64
291fac97a0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2
2016-07-31 12:41:32 -07:00
Fox McCloud
4c40a74746
Merge pull request #5254 from Crazylemon64/space_allocation
...
Updates space transitions and integrates it with the space management module
2016-07-31 12:18:19 -04:00
Tigercat2000
1ff1ee0af3
for(var/i in 1 to recipe_list.len)
2016-07-31 07:42:48 -07:00
Tigercat2000
221476ef3b
Refactor stack recipes
...
- Styling fixes
- Added post_build() to stack recipes, for any recipes that need to do
something special
- Called with two arguments, the stack that it originated from, and the
new object.
- Moved stack recipes to their own file
Currently, only two things use post_build
- Cablecuffs use it to color the cuffs the same as the wire they
originated from
- Metal rods use it to call update_icon, in order to display the correct
sprite for whatever amount of rods you created.
2016-07-31 07:20:26 -07:00
Fox McCloud
13ba6b6429
Merge pull request #5255 from IcyV/Electric-Axe-2--Electric-Boogaloo
...
Gives Atmos-Traitors a new fireaxe.
2016-07-31 00:48:06 -04:00
IcyV
da360c8703
Gives Atmos-Traitors a new fireaxe.
...
Give Atmos-traitors a unique 10TC axe to buy.
This axe starts with a single charge and can gain more charges over time
by destroying windows and grilles. Each grille or window destroyed has a
4% chance of giving another charge to the axe. On a charged hit the axe
will hit for 30 brute and 30 burn. It will otherwise function as a
normal fireaxe if out of charges.
Sprites courtesy of Fullofskittles
🆑 IcyV
add: Adds a unique axe for Atmos-traitors
/🆑
2016-07-29 21:08:50 -07:00
Crazylemon64
ae43de3652
Integrates the z level manager with the space transition system
2016-07-29 19:11:36 -07:00
Taylor Wood
869c13e493
Fixes exploding backpacks
2016-07-29 23:05:59 +01:00
Fox-McCloud
95dcbbc77b
cleaning up old code
2016-07-29 18:01:59 -04:00
Fox-McCloud
731600a21f
tweaks
2016-07-29 17:07:25 -04:00
Fox-McCloud
bde5755916
Implements Fire System
2016-07-29 13:24:09 -04:00
Kyep
4f01a05ae6
Changed Indentation
2016-07-28 22:03:55 -07:00
Tigercat2000
288af9f92c
Revert "Merge pull request #4739 from monster860/vg-parallax"
...
This reverts commit 451c93437964f26d999f
2016-07-28 15:48:27 -07:00
Fox-McCloud
1200ba6e5f
tweaks
2016-07-28 17:20:52 -04:00
monster860
b2cb87edc9
Merge branch 'master' into vg-parallax
2016-07-28 16:45:10 -04:00
TheDZD
3061214620
Merge pull request #5205 from Fox-McCloud/librarian-qol
...
Librarian QoL---Bookbag
2016-07-28 15:12:46 -04:00
Crazylemon64
11707edff8
Now with less "t"
2016-07-27 22:49:45 -07:00
Crazylemon64
7719b58cf0
Improves serialization: Now with clothes (tm)
2016-07-27 22:26:40 -07:00
TheDZD
4cba2b8d07
Merge pull request #5154 from Fox-McCloud/more-reagent-stuff
...
More Reagent Cleanup
2016-07-26 14:24:26 -04:00
TheDZD
629caa47f8
Merge pull request #5165 from Fox-McCloud/alt-click-madness
...
Alt Click Madness
2016-07-26 14:08:21 -04:00
Fox-McCloud
0870c66303
tweak
2016-07-26 14:02:07 -04:00
TheDZD
49ad9a565d
Merge pull request #5192 from Fox-McCloud/makeshift-items
...
More Makeshift Items/Weapons
2016-07-26 13:33:16 -04:00
TheDZD
bcfa4d1863
Merge pull request #5171 from Fox-McCloud/apply-damage
...
Fixes up apply_damage
2016-07-26 13:28:43 -04:00
TheDZD
1a6ceee4bd
Merge pull request #5172 from Fox-McCloud/remove-cable-coil
...
Removes Cablecuffs...
2016-07-26 13:27:59 -04:00
Fox-McCloud
c05a7d5b75
derp
2016-07-26 13:23:58 -04:00
Fox-McCloud
e06933ec09
tweakssss
2016-07-26 13:21:06 -04:00
TheDZD
6dd37a9997
Merge pull request #5198 from Spacemanspark/cardboard-box-confusion
...
Fixes cardboard boxes confusion
2016-07-26 12:52:14 -04:00
Tigercat2000
f01f33bcec
Add crew manifest world/Topic
...
Returns JSON data in the format
{ department: [{ name: title }, { name: title }] }
2016-07-26 06:27:12 -07:00
Fox-McCloud
0a574e59fe
Librarian QoL---Bookbag
2016-07-26 07:08:32 -04:00
Fox-McCloud
7f133c700d
tweak
2016-07-26 04:50:22 -04:00
Tom Heeren
9e4b00bd0d
Fixes cardboard boxes confusion
2016-07-25 14:42:07 -05:00
Fox-McCloud
0e64a91891
teleprod
2016-07-25 03:34:06 -04:00
Fox-McCloud
47b15bec0f
More Makeshift Items/Weapons
2016-07-25 02:35:01 -04:00
TheDZD
4a818f865c
Merge pull request #5159 from Fox-McCloud/bola
...
Adds in Bola, Other Recipe Tweaks
2016-07-24 23:37:24 -04:00
Kyep
01febeadb4
Refactor
2016-07-24 19:15:54 -07:00
Fox-McCloud
d20df994a6
Trauma and Burn Kit Rework
2016-07-23 09:36:51 -04:00
Kyep
114980c4ed
Major Revamp
...
1) Only Plasma Fire and N2O Knockout grenades exist now.
2) Both types now use the clusterbuster mechanic, rather than new
ZAS-like spread code, to distribute their gasses. This means their
spread is slower, but they can potentially cover more area.
3) You only get one of each type of grenade in a kit.
4) Massive refactor and elimination of code.
2016-07-23 02:01:31 -07:00
