6cee0ebac9
Adds swapping disks to the plantmanipulator ( #37765 )
2018-05-13 16:52:27 -05:00
0cac640dc8
Make admin heals also max out mood
2018-05-13 13:49:10 -05:00
e089a8254f
Merge pull request #6725 from Citadel-Station-13/upstream-merge-37731
...
[MIRROR] Makes gauze deconstructable into cloth
2018-05-13 12:19:50 -05:00
9d4fe1d85c
Merge pull request #37816 from YPOQ/bikehornfix
...
Fixes bike horn attack
2018-05-13 12:12:17 -05:00
998e49da06
Merge pull request #37809 from Qbopper/secskirts
...
Adds security jumpskirts this time with less broken github
2018-05-13 12:11:02 -05:00
9bb2d02feb
Fixes robots appearing as deactivated at round end ( #37804 )
2018-05-13 12:08:46 -05:00
53ea3dcfe1
Buckled/held cultists cant be teleport summoned ( #37805 )
2018-05-13 12:08:37 -05:00
ff8e5e92bf
Update medical.dm
2018-05-13 12:01:55 -05:00
884b8b8c4d
Update smokebomb.dm
2018-05-13 11:54:34 -05:00
ca86c93e70
Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406
...
[MIRROR] Adds (fake) ambient occlusion as a client preference
2018-05-13 11:52:23 -05:00
3ce9fba8bf
Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589
...
[MIRROR] Adds 5 new drinks
2018-05-13 11:52:12 -05:00
51b6ade3ef
Update bombspawner.dm
2018-05-13 10:18:12 -05:00
b90ca78092
Update bitfields.dm
2018-05-13 10:17:50 -05:00
37f972dc6c
Update obj_flags.dm
2018-05-13 10:17:36 -05:00
e1fef511cf
Update flags.dm
2018-05-13 10:17:28 -05:00
440d123972
Update boozeomat.dm
2018-05-13 10:16:04 -05:00
aee0160a25
Update drink_reagents.dm
2018-05-13 10:15:57 -05:00
34bf8d11aa
Update drinks_recipes.dm
2018-05-13 10:15:47 -05:00
6d5e085fd0
Update alcohol_reagents.dm
2018-05-13 10:15:26 -05:00
a3fb8d5ed4
Update drinks_recipes.dm
2018-05-13 10:15:12 -05:00
45e597c19a
Merge pull request #6724 from Citadel-Station-13/upstream-merge-37673
...
[MIRROR] Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers
2018-05-13 10:14:25 -05:00
28947e1c89
Merge pull request #6729 from Citadel-Station-13/upstream-merge-37792
...
[MIRROR] Fixes defibs/backpack watertanks/gatling lasers
2018-05-13 10:14:07 -05:00
cf28aee1ee
Merge pull request #6728 from Citadel-Station-13/upstream-merge-37464
...
[MIRROR] Adds plasma rein glass to the ORM & adjusts material values on the various glass sheets.
2018-05-13 10:12:28 -05:00
53f2fd27ca
Merge pull request #6727 from Citadel-Station-13/upstream-merge-37684
...
[MIRROR] Linked teleporters now teleport to the hub instead of the power station
2018-05-13 10:12:13 -05:00
6230a5ee9e
Merge pull request #6726 from Citadel-Station-13/upstream-merge-37737
...
[MIRROR] Fixes possession funtime
2018-05-13 10:12:00 -05:00
14f0f21c88
Update chat_commands.dm
2018-05-13 09:53:04 -05:00
2424ee0539
Quirk limit now only applies to positive quirks
2018-05-13 08:55:02 -05:00
23f6567872
Fixes defibs/watertanks/gatling lasers ( #37792 )
2018-05-13 06:13:45 -05:00
e9ef82513c
Add plasma rein glass to the ORM & adjusts material values on the various glass sheets ( #37464 )
...
* Update smelting_designs.dm
* Tweaks material values on titanium glass.
* Optimizes math & fixes errors and inconsistencies
2018-05-13 06:13:36 -05:00
5847268db3
Linked teleporters now teleport to the hub instead of the power station ( #37684 )
2018-05-13 06:13:27 -05:00
156b0529e1
Merge pull request #6722 from Citadel-Station-13/upstream-merge-37797
...
[MIRROR] Adds desc to chemmaster circ board
2018-05-13 03:30:26 -05:00
c1bbdd2f65
Merge pull request #6721 from Citadel-Station-13/upstream-merge-37752
...
[MIRROR] (NOT TESTED YET) Fixes Bedbuckling to avoid Floor is Lava
2018-05-13 03:30:15 -05:00
65fd97000c
Merge pull request #6719 from Citadel-Station-13/upstream-merge-37707
...
[MIRROR] Fixes large crates (Issue #36516 )
2018-05-13 03:29:21 -05:00
289cbbb375
Merge pull request #6718 from Citadel-Station-13/upstream-merge-37697
...
[MIRROR] Makes the redirect component able to transfer with changeturfs
2018-05-13 03:28:57 -05:00
ee9e96106e
Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742
...
[MIRROR] spellig fix
2018-05-13 03:28:39 -05:00
80aad142a4
Merge branch 'master' into upstream-merge-37406
2018-05-13 03:28:37 -05:00
e31829a7e9
Merge pull request #6716 from Citadel-Station-13/upstream-merge-37754
...
[MIRROR] family heirlooms properly open the backpack upon spawning if they're in the backpack
2018-05-12 21:37:53 -05:00
646403e6e1
Merge pull request #6715 from Citadel-Station-13/upstream-merge-37772
...
[MIRROR] Fixes morphs
2018-05-12 21:37:34 -05:00
e164668c5e
Update negative.dm
2018-05-12 21:37:26 -05:00
cbfa3053ee
Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558
...
[MIRROR] Anomaly Armour Research
2018-05-12 21:36:51 -05:00
1c164ff28f
Fixes possession funtime ( #37737 )
...
* Fixes possession funtime
* This should probably be generic backend mob list but i can't think of anything else that would need it.
2018-05-12 19:26:55 -05:00
b11e600cff
Makes gauze deconstructable into cloth
2018-05-12 19:15:32 -05:00
8463204549
Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers
2018-05-12 18:53:59 -05:00
11d63f6a56
Adds desc to chemmaster circ board ( #37797 )
...
* adds desc to chemmaster circ board
* ASS♂WE♂CAN♂
* don't drink and web edit kids
2018-05-12 17:49:29 -05:00
023f93f734
Fixes Bedbuckling to avoid Floor is Lava ( #37752 )
...
* Update floor_is_lava.dm
* Pulls the check out of the loop.
2018-05-12 17:44:12 -05:00
82a7a2ee2c
Merge pull request #6712 from Citadel-Station-13/upstream-merge-37771
...
[MIRROR] lets admins see dsay if they're in-game and unconscious
2018-05-12 17:04:56 -05:00
6d5ace8227
Merge pull request #6707 from Citadel-Station-13/upstream-merge-37782
...
[MIRROR] [s] Fixes an admin unprotected var read/write exploit
2018-05-12 17:04:39 -05:00
f21cac1af2
Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399
...
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-12 17:04:23 -05:00
b0b9240466
Fixes large crates acting like lockers ( #37707 )
...
* Fixes large crates acting like lockers
* removes forgotten comment
* Adds Cobby's suggestions, and makes the description more useful. Also improves feedback when using the wrong tool.
2018-05-12 16:41:54 -05:00
b036b1e519
Makes the redirect component able to transfer with changeturfs ( #37697 )
2018-05-12 16:29:28 -05:00
Dax Dupont