Aurorablade
36f9727d4d
fixes
2017-05-09 03:39:53 -04:00
Fox McCloud
c599802495
Merge pull request #7178 from uraniummeltdown/lawset
...
Removes Roundstart Validhunt Lawsets
2017-05-06 19:09:16 -04: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
e50e597dc6
Final tweaks
...
final tweaks
2017-04-29 22:41:47 -04: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
Fox McCloud
e02e878022
Merge pull request #7173 from FlattestGuitar/progbar
...
Animated progress bars!
2017-04-25 19:49:26 -04:00
FlattestGuitar
4779a9034b
Animated progress bars!
2017-04-25 23:59:02 +02: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
uraniummeltdown
2a540293fc
removes robocop, paladin, nt default from roundstart ai lawsets
2017-04-23 21:42:38 +04:00
Crazy Lemon
327f89c890
Merge pull request #6950 from Fox-McCloud/tesla-tweaks
...
Tesla Update
2017-04-21 09:52:23 -07: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
Fox McCloud
db18224eb0
Merge pull request #7090 from ZomgPonies/superheroes2
...
Superheroes update
2017-04-16 17:48:52 -04: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
Warior4356
866cec8a5c
Requested changes completed
2017-04-14 01:16:13 -07:00
ZomgPonies
286a9261b6
Spacing fixes
2017-04-11 20:49:18 -04:00
ZomgPonies
d328af331f
Switched Stun to Slowed
2017-04-11 20:05:35 -04:00
ZomgPonies
06ba71d003
Superheroes update
2017-04-11 19:53:08 -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
Crazy Lemon
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07: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
4ad7cd17fd
Merge pull request #7043 from SamHPurp/assorted-fixes
...
Fixes
2017-04-05 19:15:12 -04:00
Twinmold
11c9c8d10b
Fixes Poison Pen
...
Fixes not getting the poison pen when you buy it as Cargo Tech,
Quartermaster, or Head of Personnel. Instead, you currently get a
Guardian kit instead.
:cl:Twinmold
Fixes: Buying poison pen will actually give you the poison pen now.
/🆑
2017-04-05 05:16:21 -05: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
Warior4356
6807b8ba95
Merge remote-tracking branch 'ParadiseSS13/master' into Virtual-Avatars
2017-04-02 02:47:42 -07:00
Warior4356
dbf989be51
Phase one done.
2017-04-02 01:50:51 -07:00
Fox-McCloud
183702a36e
fix up 2.0
2017-04-02 00:38:14 -04:00
Mark van Alphen
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
Fox-McCloud
c08c13689c
Merge remote-tracking branch 'upstream/master' into tesla-tweaks
2017-03-30 17:38:04 -04:00
Fox McCloud
00d8a089cd
Merge pull request #6953 from tigercat2000/airlocks_ree
...
Completely remove second power/backup wire from airlocks.
2017-03-28 18:57:03 -04:00
Fox McCloud
28b53b465b
Merge pull request #6967 from jughu/Atmos
...
Fixes #6965
2017-03-28 05:55:01 -04:00
jughu
6450c84d74
Hahehanjdjxjwnbdjsu
2017-03-28 11:43:22 +02:00
Tigercat2000
7d956d1500
Completely remove second power/backup wire from airlocks.
...
Pulsing them has been broken since commit 60994c59
2017-03-26 17:03:41 -07:00
Fox McCloud
656b4285a0
Merge pull request #6698 from Kyep/gateway_listeningpost
...
Converts "Listening Post" away mission into a space ruin
2017-03-26 19:07:36 -04:00
Fox-McCloud
ee44034138
Tesla Update
2017-03-26 17:53:55 -04:00
Warior4356
a44d4bb8d3
making backup
2017-03-25 17:09:17 -07:00
FlattestGuitar
4445a34650
Merge branch 'master' into outfiterinos
2017-03-25 21:20:51 +01:00
FlattestGuitar
c0ac235704
Touching up the admin outfits...
2017-03-25 18:45:36 +01:00
Mark van Alphen
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
Crazylemon64
36ec603a51
Rod form is now half-speed, and has a warning sound
2017-03-22 10:30:24 -07:00
Warior4356
ef9ad52706
Avatar code working
2017-03-20 17:34:40 -07:00
Sam
e43cb810a8
More bits wew.
2017-03-20 06:37:56 +00:00
Sam
3af44d2a08
More typos fixed...
2017-03-19 05:13:20 +00:00
Mark van Alphen
06b3460d6e
Merge branch 'master' into findnreplace
2017-03-15 16:02:14 +01:00
Fox McCloud
c6e3fe3cdb
Merge pull request #6734 from uraniummeltdown/plastic
...
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
