Commit Graph

6154 Commits

Author SHA1 Message Date
ike709
1babecaf3c New vent and scrubber sprites (#32742)
* New vent and scrubber sprites

* Readds OFF and siphon arrow to map sprites
2017-11-15 19:09:21 -06:00
LetterJay
286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
LetterJay
1dd3e337f8 Merge pull request #3956 from Citadel-Station-13/cleanup
Cleans up shit in the admin panel
2017-11-15 14:57:12 -06:00
LetterJay
30394c5da5 Merge branch 'master' into upstream-merge-32757 2017-11-15 13:01:55 -06:00
LetterJay
a90a1d8eca Update player_panel.dm 2017-11-15 12:20:30 -06:00
LetterJay
d899fadd18 missed this during the REF purge 2017-11-15 12:17:49 -06:00
LetterJay
9849b9a13b Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482
[MIRROR] Improves the deep fryer
2017-11-15 11:13:56 -06:00
CitadelStationBot
d29bae26e0 Merge pull request #3954 from Citadel-Station-13/upstream-merge-32737
[MIRROR] Fixes AI door hotkeys & other weirdness
2017-11-15 11:08:25 -06:00
CitadelStationBot
e83b175f30 Merge pull request #3953 from Citadel-Station-13/upstream-merge-32729
[MIRROR] removes an unused var from radio code
2017-11-15 11:05:19 -06:00
CitadelStationBot
607294a2b6 Merge pull request #3952 from Citadel-Station-13/upstream-merge-32630
[MIRROR] Alternative grille sprite update
2017-11-15 11:02:04 -06:00
LetterJay
2715fd1b6c Merge pull request #3950 from deathride58/slimernosliming
Re-disables slimeperson splitting
2017-11-15 10:54:51 -06:00
LetterJay
9ec256632a Merge pull request #3949 from Citadel-Station-13/upstream-merge-32569
[MIRROR] [512] Makes gas mouse transparent
2017-11-15 10:51:35 -06:00
LetterJay
a8d73f8ec2 Merge pull request #3948 from Citadel-Station-13/upstream-merge-32726
[MIRROR] Removes some attackby crowbar checks on nuclear bombs and camera assemblies
2017-11-15 10:51:04 -06:00
LetterJay
f45006ef57 Merge pull request #3947 from Citadel-Station-13/upstream-merge-32719
[MIRROR] Fixes a runtime with glowshrooms
2017-11-15 10:41:41 -06:00
LetterJay
e7e060d83b Merge pull request #3946 from Citadel-Station-13/upstream-merge-32692
[MIRROR] Adds some server tools info to getrev
2017-11-15 10:41:25 -06:00
LetterJay
163ef812fb Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
LetterJay
2f71e0f724 Merge pull request #3944 from Citadel-Station-13/upstream-merge-32714
[MIRROR] Tesla no longer NOTHING PERSONNEL's the power beacon
2017-11-15 10:40:59 -06:00
LetterJay
46ba6cbc7b Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620
[MIRROR] Greatly increases the performance of station-ending plasma fires
2017-11-15 10:40:40 -06:00
LetterJay
37085ee10e Merge pull request #3930 from Citadel-Station-13/upstream-merge-32723
[MIRROR] Makes cryoxadone heal clone damage again
2017-11-15 10:40:13 -06:00
LetterJay
853e9a0ed5 Merge pull request #3918 from Citadel-Station-13/upstream-merge-32280
[MIRROR] Performance and usability improvement for blueprints
2017-11-15 10:39:40 -06:00
LetterJay
ce0ce0b6b9 Update changeling.dm 2017-11-15 10:38:57 -06:00
LetterJay
668248b987 combines the missed microwave PR 2017-11-15 10:31:41 -06:00
LetterJay
3c28ea5426 Merge pull request #3713 from Citadel-Station-13/upstream-merge-32277
[MIRROR] Removes golem debug code that spams world
2017-11-15 10:30:31 -06:00
LetterJay
c725b0d30c Update machinery_sounds.dm 2017-11-15 10:25:34 -06:00
LetterJay
1939e96bb6 Merge branch 'master' into upstream-merge-32183 2017-11-15 10:22:40 -06:00
LetterJay
16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
Emmett Gaines
ab21f8d5ed 511 client fix and a config to make the version warning a popup 2017-11-15 04:39:36 -06:00
AnturK
13ebff97df Fixes AI door hotkeys & other weirdness 2017-11-15 02:03:17 -06:00
oranges
156aa30c61 Merge pull request #32729 from Qustinnus/cheapGBP
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
Matt Smith
c4789d497a Alternative grille sprite update (#32630)
* Update grille sprite

* Add damaged grille sprite

* Add 4 varients to the damaged grille
2017-11-14 23:55:25 -06:00
deathride58
f1274b41f2 redisables slime splitting 2017-11-14 19:27:19 -05:00
Emmett Gaines
9b75113631 [512] Makes gas mouse transparent (#32569)
* Makes gas mouse transparent

* readability cleanup

* future proofing
2017-11-14 17:47:01 -06:00
Leo
4d1ea753c3 Removes some attackby crowbar checks on nuclear bombs and camera assemblies (#32726) 2017-11-14 17:44:49 -06:00
LetterJay
0885c57b39 Update mob.dm 2017-11-14 16:10:46 -06:00
LetterJay
66445eb80b Update syndicatebeacon.dm 2017-11-14 16:07:26 -06:00
LetterJay
ccc9158819 Update station_alert.dm 2017-11-14 16:06:54 -06:00
LetterJay
809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
LetterJay
44d15b07fb Merge pull request #3942 from Citadel-Station-13/upstream-merge-32607
[MIRROR] Alt clicking additions
2017-11-14 15:57:06 -06:00
LetterJay
7ce3b246ad Merge pull request #3941 from Citadel-Station-13/upstream-merge-32707
[MIRROR] More nuanced damage examination
2017-11-14 15:56:57 -06:00
LetterJay
b4c1ca31d9 Merge pull request #3940 from Citadel-Station-13/upstream-merge-32687
[MIRROR] Fixes leg day
2017-11-14 15:56:47 -06:00
LetterJay
62c7cfc4e7 Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689
[MIRROR] Fixes a bunch of hand tele/portal issues.
2017-11-14 15:56:08 -06:00
LetterJay
aea2e8716d Merge pull request #3937 from Citadel-Station-13/upstream-merge-32636
[MIRROR] Heirophant Relay sprites
2017-11-14 15:55:55 -06:00
LetterJay
528255833f Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684
[MIRROR] Fix the station integrity report to read the correct Z
2017-11-14 15:54:44 -06:00
LetterJay
7fa3a16a0b Merge pull request #3934 from Citadel-Station-13/upstream-merge-32598
[MIRROR] Cult Scaling Refactor
2017-11-14 15:54:08 -06:00
LetterJay
19abbdfd5f Merge pull request #3931 from Citadel-Station-13/upstream-merge-32685
[MIRROR] Little things 2 Revenge of atmos components
2017-11-14 15:52:32 -06:00
LetterJay
2d137b2bf9 Update medicine_reagents.dm 2017-11-14 15:51:58 -06:00
LetterJay
d9ce438bbb Merge pull request #3929 from Citadel-Station-13/upstream-merge-32656
[MIRROR] Directional computer sprites
2017-11-14 15:51:35 -06:00
LetterJay
829d981fa5 Merge pull request #3928 from Citadel-Station-13/upstream-merge-32594
[MIRROR] Update AI Airlock UI to use TGUI
2017-11-14 15:51:18 -06:00
LetterJay
bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481
[MIRROR] [READY]integrated circuitry port+upgrade.
2017-11-14 15:51:03 -06:00
MoreRobustThanYou
a970bc2283 Fixes a runtime with glowshrooms (#32719) 2017-11-14 15:36:53 -06:00