Commit Graph

6177 Commits

Author SHA1 Message Date
Matt Smith
fc90cf5344 Removed unused HTML tags (#32787) 2017-11-16 17:08:51 -06:00
deathride58
0e0eb351b3 Merge pull request #3707 from Citadel-Station-13/upstream-merge-32221
[MIRROR] Fixes allow_custom_shuttles default
2017-11-16 17:34:22 +00:00
deathride58
20ebbce73b Merge pull request #3966 from Citadel-Station-13/upstream-merge-32650
[MIRROR] Speeds up saycode by almost doubling get_hearers_in_view() performance
2017-11-16 17:28:05 +00:00
deathride58
9e12843794 Merge pull request #3965 from Citadel-Station-13/upstream-merge-32753
[MIRROR] Smoke circuit only notifies admins on first use and reagent change
2017-11-16 17:26:52 +00:00
deathride58
f6e4e77b80 Merge pull request #3962 from Citadel-Station-13/upstream-merge-32743
[MIRROR] Fixes pipe dispensers being unable to dispense bent pipes
2017-11-16 17:26:18 +00:00
deathride58
6cfe16000d Merge pull request #3961 from Citadel-Station-13/upstream-merge-32742
[MIRROR] New vent and scrubber sprites
2017-11-16 17:25:55 +00:00
deathride58
8f34c6cc0c Merge pull request #3960 from Citadel-Station-13/upstream-merge-32748
[MIRROR] Fixes cell charger animation
2017-11-16 17:25:23 +00:00
deathride58
0b1043a739 Merge pull request #3959 from Citadel-Station-13/upstream-merge-32750
[MIRROR] actually use disable_warning mob_can_equip
2017-11-16 17:24:58 +00:00
vuonojenmustaturska
23f2815bb7 Speeds up saycode by almost doubling get_hearers_in_view() performance (#32650)
* The sun is also a warrior

* Knowledge can also destroy

* nor can the kindest will preserve you from the kill
2017-11-16 05:09:20 -06:00
Jordie
eaa1d752a8 Merge pull request #32753 from optimumtact/wegetityouvape
Smoke circuit only notifies admins on first use and reagent change
2017-11-16 02:11:24 -06:00
ACCount
1b9280776e Fixes pipe dispensers being unable to dispense bent pipes (#32743)
* Fixes pipe dispensers not dispensing bent pipes

* Updates meter RPD icon file to the one that's actually used
2017-11-15 19:12:34 -06:00
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
AutomaticFrenzy
508da3ebb3 Fixes cell charger animation (#32748) 2017-11-15 19:08:10 -06:00
AutomaticFrenzy
cb7d45c980 actually use disable_warning mob_can_equip (#32750) 2017-11-15 19:07:01 -06:00
Tad Hardesty
5abfb077bd Fix Create Object/Turf/Mob all having the same title (#32747) 2017-11-15 19:06:51 -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