2a540293fc
removes robocop, paladin, nt default from roundstart ai lawsets
2017-04-23 21:42:38 +04:00
327f89c890
Merge pull request #6950 from Fox-McCloud/tesla-tweaks
...
Tesla Update
2017-04-21 09:52:23 -07:00
d786a78e2e
Merge branch 'master' into findnreplace
2017-04-19 20:41:05 +02:00
18ffff09f4
Merge pull request #7026 from warior4356/Virtual-Avatars
...
VR Phase #1
2017-04-18 21:25:35 -07:00
db18224eb0
Merge pull request #7090 from ZomgPonies/superheroes2
...
Superheroes update
2017-04-16 17:48:52 -04:00
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
866cec8a5c
Requested changes completed
2017-04-14 01:16:13 -07:00
286a9261b6
Spacing fixes
2017-04-11 20:49:18 -04:00
d328af331f
Switched Stun to Slowed
2017-04-11 20:05:35 -04:00
06ba71d003
Superheroes update
2017-04-11 19:53:08 -04:00
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
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07:00
932cae0224
Loyalty implant -> Mindshield Implant
2017-04-09 16:50:51 +01:00
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
4ad7cd17fd
Merge pull request #7043 from SamHPurp/assorted-fixes
...
Fixes
2017-04-05 19:15:12 -04:00
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
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
88ec05be4e
Couple typos and a gramatically tweak
2017-04-04 14:27:22 +01:00
6807b8ba95
Merge remote-tracking branch 'ParadiseSS13/master' into Virtual-Avatars
2017-04-02 02:47:42 -07:00
dbf989be51
Phase one done.
2017-04-02 01:50:51 -07:00
183702a36e
fix up 2.0
2017-04-02 00:38:14 -04:00
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
c08c13689c
Merge remote-tracking branch 'upstream/master' into tesla-tweaks
2017-03-30 17:38:04 -04:00
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
28b53b465b
Merge pull request #6967 from jughu/Atmos
...
Fixes #6965
2017-03-28 05:55:01 -04:00
6450c84d74
Hahehanjdjxjwnbdjsu
2017-03-28 11:43:22 +02:00
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
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
ee44034138
Tesla Update
2017-03-26 17:53:55 -04:00
a44d4bb8d3
making backup
2017-03-25 17:09:17 -07:00
4445a34650
Merge branch 'master' into outfiterinos
2017-03-25 21:20:51 +01:00
c0ac235704
Touching up the admin outfits...
2017-03-25 18:45:36 +01:00
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
36ec603a51
Rod form is now half-speed, and has a warning sound
2017-03-22 10:30:24 -07:00
ef9ad52706
Avatar code working
2017-03-20 17:34:40 -07:00
e43cb810a8
More bits wew.
2017-03-20 06:37:56 +00:00
3af44d2a08
More typos fixed...
2017-03-19 05:13:20 +00:00
06b3460d6e
Merge branch 'master' into findnreplace
2017-03-15 16:02:14 +01:00
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
85260a72ba
plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines
2017-03-12 06:09:29 +04:00
d6da6e3f52
Merge pull request #6527 from davipatury/modular_computers
...
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01:00
781e66ec52
Fix conflicts.
2017-03-08 12:57:45 -03:00
acab5d5170
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz
...
# Conflicts:
# code/game/objects/items/weapons/storage/bags.dm
# code/game/objects/items/weapons/storage/uplink_kits.dm
# code/game/objects/items/weapons/storage/wallets.dm
2017-03-08 10:45:16 +01:00
b26d50d9f9
Merge branch 'master' into findnreplace
2017-03-08 10:37:10 +01:00
48cde247b0
Adds listening post space ruin
...
http://i.imgur.com/Z6OEBNp.png
2017-03-08 00:02:57 -08:00
f96c335d1f
Merge pull request #6704 from uraniummeltdown/hardsuit
...
Rename all "rigs" (hardsuits) to hardsuits
2017-03-07 23:35:07 -05:00
dc6f9f5506
rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands
2017-03-07 20:55:43 +04:00
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
3b73053bc4
Tool fixes
2017-03-06 20:46:24 +01:00
uraniummeltdown
