Commit Graph
11823 Commits
Author SHA1 Message Date
PoojawaandGitHub 655067471a Fixes *wag for mammals
Someone forgot that we have snowflake bodyparts.
2018-01-14 03:50:26 -06:00
LetterJayandGitHub 703275c86f Merge pull request #4803 from Citadel-Station-13/upstream-merge-34276
[MIRROR] Update TGS API to 3.2.0.2
2018-01-14 03:12:31 -06:00
deathride58andGitHub 33954016b8 Merge pull request #4820 from Citadel-Station-13/upstream-merge-34407
[MIRROR] Make traitor panel clearer when toggling completion state
2018-01-14 06:49:38 +00:00
CitadelStationBot 30264e5e19 Make traitor panel clearer when toggling completion state 2018-01-13 23:21:46 -06:00
Jordan BrownandCitadelStationBot f7d70d1454 Merge pull request #34407 from optimumtact/anturredtextsmyevent
Make traitor panel clearer when toggling completion state
2018-01-13 23:21:46 -06:00
CitadelStationBot b8a93b6ca1 Automatic changelog generation for PR #4818 [ci skip] 2018-01-13 22:24:57 -06:00
deathride58andGitHub 1c2bcd7f3f Merge pull request #4818 from deathride58/preffix
Fixes character slot changing erroring out due to attempt_vr runtimes
2018-01-14 04:24:54 +00:00
deathride58 9332db5bb0 Fixes character slot changing runtiming 2018-01-13 23:08:50 -05:00
CitadelStationBot cc29b029c8 Automatic changelog generation for PR #4817 [ci skip] 2018-01-13 22:01:35 -06:00
deathride58andGitHub 87b614aaf9 Merge pull request #4817 from Citadel-Station-13/upstream-merge-34338
[MIRROR] Replaces cached get_area vars to grab area names with get_area_name()
2018-01-14 04:01:33 +00:00
deathride58andGitHub ef29d783e9 Merge pull request #4816 from Citadel-Station-13/upstream-merge-34328
[MIRROR] Updates TIMER_UNIQUE documentation
2018-01-14 04:01:15 +00:00
CitadelStationBot 942eb9f59e Automatic changelog generation for PR #4815 [ci skip] 2018-01-13 22:00:56 -06:00
deathride58andGitHub 8717e2f04e Merge pull request #4815 from Citadel-Station-13/upstream-merge-34359
[MIRROR] Makes the NT Lepton Violet over lava windows lava proof
2018-01-14 04:00:54 +00:00
deathride58andGitHub 1cbc4596d3 Merge pull request #4814 from Citadel-Station-13/upstream-merge-34376
[MIRROR] Fixes mecha pilot speed.
2018-01-14 04:00:39 +00:00
deathride58andGitHub 3b0cb3a6c2 Merge pull request #4813 from Citadel-Station-13/upstream-merge-34365
[MIRROR] Fixes cables/lattices for lateloaded templates.
2018-01-14 04:00:24 +00:00
CitadelStationBot 94c3069e6f Replaces cached get_area vars to grab area names with get_area_name() 2018-01-13 20:56:11 -06:00
ShizCalevandCitadelStationBot 80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
CitadelStationBot 551b86356e Updates TIMER_UNIQUE documentation 2018-01-13 17:23:47 -06:00
Jordan BrownandCitadelStationBot effea9f679 Updates TIMER_UNIQUE documentation (#34328) 2018-01-13 17:23:47 -06:00
CitadelStationBot 99d1fa4784 Makes the NT Lepton Violet over lava windows lava proof 2018-01-13 14:52:21 -06:00
Dax DupontandCitadelStationBot 077ec06f78 Rebases and redoes it with the fix with mapmerge2 2018-01-13 14:52:21 -06:00
CitadelStationBot 9b2d395d28 Fixes mecha pilot speed. 2018-01-13 14:51:10 -06:00
AnturKandCitadelStationBot 50529187d6 Fixes mecha pilot speed. 2018-01-13 14:51:10 -06:00
CitadelStationBot 0722f96e8b Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
AnturKandCitadelStationBot 269cbab223 Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
CitadelStationBot 3a2ac4d102 Automatic changelog generation for PR #4812 [ci skip] 2018-01-13 14:29:28 -06:00
deathride58andGitHub bfd2f6cd24 Merge pull request #4812 from Citadel-Station-13/upstream-merge-34362
[MIRROR] Code fix for stat_entry on NO_FIRE subsystems
2018-01-13 20:29:26 +00:00
deathride58andGitHub 257ee69202 Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360
[MIRROR] Fixes clownborg sprays not recharging
2018-01-13 20:29:01 +00:00
CitadelStationBot 5815ac156d Automatic changelog generation for PR #4810 [ci skip] 2018-01-13 14:28:46 -06:00
deathride58andGitHub 6b5f8b0cad Merge pull request #4810 from Citadel-Station-13/upstream-merge-34347
[MIRROR] Fix the Ark's z-level checks
2018-01-13 20:28:43 +00:00
CitadelStationBot 27a695ce5f Automatic changelog generation for PR #4809 [ci skip] 2018-01-13 14:28:24 -06:00
deathride58andGitHub a572a24dfe Merge pull request #4809 from Citadel-Station-13/upstream-merge-34355
[MIRROR] Fixes goon escape shuttle
2018-01-13 20:28:22 +00:00
CitadelStationBot f6c53d8f6e Automatic changelog generation for PR #4808 [ci skip] 2018-01-13 14:27:56 -06:00
deathride58andGitHub c47008b123 Merge pull request #4808 from Citadel-Station-13/upstream-merge-34357
[MIRROR] Fix RPD runtimes and offsets of layered connector ports
2018-01-13 20:27:54 +00:00
deathride58andGitHub 6df769de46 Merge pull request #4807 from Citadel-Station-13/upstream-merge-34358
[MIRROR] Cleans up a nesting level in pet attackby
2018-01-13 20:27:12 +00:00
deathride58andGitHub 412e43674c Merge pull request #4806 from Citadel-Station-13/upstream-merge-34342
[MIRROR] for var i in 1 to dildos
2018-01-13 20:26:49 +00:00
CitadelStationBot dd09677c7b Automatic changelog generation for PR #4805 [ci skip] 2018-01-13 14:26:30 -06:00
deathride58andGitHub 3da566f86b Merge pull request #4805 from Citadel-Station-13/upstream-merge-34346
[MIRROR] Fix slot machine design icon
2018-01-13 20:26:28 +00:00
CitadelStationBot efde92c5b4 Automatic changelog generation for PR #4802 [ci skip] 2018-01-13 14:25:31 -06:00
deathride58andGitHub 7d5c3897e3 Merge pull request #4802 from Citadel-Station-13/upstream-merge-34350
[MIRROR] Grammarize the internals screen object
2018-01-13 20:25:29 +00:00
deathride58andGitHub 9742597382 Merge pull request #4801 from Citadel-Station-13/upstream-merge-34343
[MIRROR] Penguins are immune to cold
2018-01-13 20:25:01 +00:00
deathride58andGitHub 7ec007d204 Merge pull request #4800 from Citadel-Station-13/upstream-merge-34352
[MIRROR] Remove unnused random event
2018-01-13 20:24:42 +00:00
CitadelStationBot fb2a6a1f54 Automatic changelog generation for PR #4799 [ci skip] 2018-01-13 14:24:15 -06:00
deathride58andGitHub 0cad3946c3 Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161
[MIRROR] Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 20:24:13 +00:00
CitadelStationBot 8c03304151 Automatic changelog generation for PR #4798 [ci skip] 2018-01-13 14:23:06 -06:00
deathride58andGitHub b586ec55a7 Merge pull request #4798 from Citadel-Station-13/upstream-merge-33958
[MIRROR] Dreaming Improvements
2018-01-13 20:23:03 +00:00
CitadelStationBot 4c21247700 Automatic changelog generation for PR #4797 [ci skip] 2018-01-13 14:22:25 -06:00
deathride58andGitHub 9c19710b72 Merge pull request #4797 from Citadel-Station-13/upstream-merge-34155
[MIRROR] Allows admins to select an outfit while transforming a mob to human via rudimentary transform
2018-01-13 20:22:23 +00:00
CitadelStationBot c7d71df466 Automatic changelog generation for PR #4796 [ci skip] 2018-01-13 14:22:07 -06:00
deathride58andGitHub 90b35d405a Merge pull request #4796 from Citadel-Station-13/upstream-merge-33699
[MIRROR] Makes vault safe slightly less explosion-proof
2018-01-13 20:22:05 +00:00