Commit Graph

2458 Commits

Author SHA1 Message Date
deathride58
711ca534d9 Merge pull request #4010 from Citadel-Station-13/upstream-merge-32851
[MIRROR] Fixes suicidal blobbernauts
2017-11-19 04:33:08 +00:00
deathride58
8c64f1cc49 Merge pull request #4006 from Citadel-Station-13/upstream-merge-32837
[MIRROR] Fixes topic logs exposing serviceCommsKey
2017-11-19 04:28:21 +00:00
KorPhaeron
47b9cc2051 Fixes suicidal blobbernauts (#32851)
* Fixes suicidal blobbernauts

* Removes notransform
2017-11-18 18:37:50 -06:00
Jordan Brown
8b7e3b7b7c Fixes topic logs exposing serviceCommsKey (#32837) 2017-11-18 13:52:08 -06:00
JJRcop
ca9834613c Removes duplicate data for ai airlock menu (#32843) 2017-11-18 13:51:27 -06:00
deathride58
1d841ce65a Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
[MIRROR] RPD ui improvements
2017-11-18 05:40:13 +00:00
deathride58
a15007cd5a Merge pull request #3992 from Citadel-Station-13/upstream-merge-32761
[MIRROR] Tweaks AI door open and close buttons
2017-11-18 05:39:22 +00:00
deathride58
04d290aa11 Merge pull request #3967 from Citadel-Station-13/upstream-merge-32775
[MIRROR] Makes the operation computer tgui
2017-11-18 05:38:59 +00:00
deathride58
9e78bcd8f9 Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
2017-11-18 05:29:32 +00:00
deathride58
38f7b829c3 Update manifest.dm 2017-11-17 23:20:44 -05:00
deathride58
e478e5640a Update tracking.dm 2017-11-17 23:20:15 -05:00
deathride58
674cce2d85 Merge pull request #3986 from Citadel-Station-13/upstream-merge-32804
[MIRROR] Add the ability to osay from the viewvar dropdown
2017-11-18 04:15:58 +00:00
CitadelStationBot
0beef30fb7 Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993) 2017-11-17 19:02:40 -08:00
duncathan salt
52fc5e8bc6 RPD ui improvements 2017-11-17 18:03:56 -06:00
JJRcop
244e823558 Tweaks AI door open and close buttons 2017-11-17 12:53:16 -06:00
oranges
a637da3b0f Add the ability to osay from the viewvar dropdown (#32804) 2017-11-17 03:49:08 -06:00
CitadelStationBot
fd12953f10 [MIRROR] New -> Initialize (#3972)
* New -> Initialize (#32777)

* New -> Initialize

* Remove loc from Initialize

* New -> Initialize
2017-11-17 00:24:02 -08:00
deathride58
706e691fef Merge pull request #3981 from Citadel-Station-13/upstream-merge-32778
[MIRROR] Makes you turn when pulling and adds sound to rolling bed and chair
2017-11-17 04:52:22 +00:00
deathride58
9057436da3 Update odysseus.dm 2017-11-16 23:32:17 -05:00
deathride58
8f8193d0f6 Update Operating.dm 2017-11-16 21:10:06 -05:00
nicbn
df514d7411 Makes you turn when pulling and adds sound to rolling bed and chair (#32778)
* Makes you turn at what you are pulling and adds sound to rolling bed and chair

* ShizCalev's sound
2017-11-16 18:44:05 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
oranges
952fa2a0f2 Fix conflicts between helmet/mech HUDs and HUD glasses 2017-11-16 15:39:15 -06:00
Dax Dupont
3fbe3bdd63 Makes the operation computer tgui 2017-11-16 14:29:18 -06: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
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
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
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
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
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
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
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
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
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
Leo
4d1ea753c3 Removes some attackby crowbar checks on nuclear bombs and camera assemblies (#32726) 2017-11-14 17:44:49 -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
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