shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,576 Commits 5 Branches 0 Tags
fd63ae9dbfa205c00313f7e00fc7d1710cd83d4c
Commit Graph

10450 Commits

Author SHA1 Message Date
LetterJay
f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
LetterJay
c92a18f733 Update syndicate.dm 2018-05-13 22:07:01 -05:00
CitadelStationBot
1123df32b3 Merge pull request #6740 from Citadel-Station-13/upstream-merge-37794 
[MIRROR] Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites.
 2018-05-13 20:39:21 -05:00
CitadelStationBot
8b5c2d3108 Merge pull request #6739 from Citadel-Station-13/upstream-merge-37525 
[MIRROR] Replaces adding goliath plates to clothing and APLUs with a customizable tracking component
 2018-05-13 20:38:49 -05:00
CitadelStationBot
ca9f309ddb Merge pull request #6738 from Citadel-Station-13/upstream-merge-37789 
[MIRROR] Log dchat to the individual say log for a mob
 2018-05-13 20:38:29 -05:00
CitadelStationBot
4e8b096710 Merge pull request #6737 from Citadel-Station-13/upstream-merge-37765 
[MIRROR] Adds swapping disks to the plantmanipulator
 2018-05-13 20:37:54 -05:00
JStheguy
c462c16cc7 Marginally to Mildly Improves Vending Machine, Burger, and Donut sprites. (#37794) 
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony
 2018-05-13 19:47:01 -05:00
CitadelStationBot
0511aaa5d5 Merge pull request #6736 from Citadel-Station-13/upstream-merge-37788 
[MIRROR] Make admin heals also max out mood
 2018-05-13 18:59:05 -05:00
CitadelStationBot
3e090c4537 Merge pull request #6735 from Citadel-Station-13/upstream-merge-37816 
[MIRROR] Fixes bike horn attack
 2018-05-13 18:58:40 -05:00
CitadelStationBot
c4a46ae194 Merge pull request #6734 from Citadel-Station-13/upstream-merge-37809 
[MIRROR] Adds security jumpskirts this time with less broken github
 2018-05-13 18:58:10 -05:00
CitadelStationBot
bd9482aec8 Merge pull request #6733 from Citadel-Station-13/upstream-merge-37804 
[MIRROR] Fixes living robots appearing as deactivated at round end
 2018-05-13 18:57:25 -05:00
CitadelStationBot
3f4f48dd2d Merge pull request #6732 from Citadel-Station-13/upstream-merge-37805 
[MIRROR] Buckled/pulled cultists cant be teleport summoned
 2018-05-13 18:57:03 -05:00
Barhandar
bcd2b0a3b0 Replaces adding goliath plates to clothing and APLUs with a customizable tracking component (#37525) 
add: Amount of goliath plates is now shown in examine for explorer suits and mining hardsuits.


I was peeved by being unable to tell whether the armour is upgraded or not except by trying to stick more plates on it.

I think a more correct way would be to add a plate amount var to these items similarly to APLU plating and then have description mention their amount and, for added transparency, that it's possible to improve it if there's 0 plates.

Please point the errors/wrongs in it, since "current armour value minus constant divided by value each plate adds" is rather clunky code.
 2018-05-13 18:55:56 -05:00
oranges
0f9f43067d Log dchat to the individual say log for a mob (#37789) 2018-05-13 16:59:45 -05:00
Dax Dupont
6cee0ebac9 Adds swapping disks to the plantmanipulator (#37765) 2018-05-13 16:52:27 -05:00
Tad Hardesty
0cac640dc8 Make admin heals also max out mood 2018-05-13 13:49:10 -05:00
CitadelStationBot
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
vuonojenmustaturska
9d4fe1d85c Merge pull request #37816 from YPOQ/bikehornfix 
Fixes bike horn attack
 2018-05-13 12:12:17 -05:00
vuonojenmustaturska
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
KorPhaeron
9bb2d02feb Fixes robots appearing as deactivated at round end (#37804) 2018-05-13 12:08:46 -05:00
KorPhaeron
53ea3dcfe1 Buckled/held cultists cant be teleport summoned (#37805) 2018-05-13 12:08:37 -05:00
CitadelStationBot
ff8e5e92bf Update medical.dm 2018-05-13 12:01:55 -05:00
LetterJay
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
LetterJay
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
LetterJay
6d5e085fd0 Update alcohol_reagents.dm 2018-05-13 10:15:26 -05:00
LetterJay
a3fb8d5ed4 Update drinks_recipes.dm 2018-05-13 10:15:12 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
6230a5ee9e Merge pull request #6726 from Citadel-Station-13/upstream-merge-37737 
[MIRROR] Fixes possession funtime
 2018-05-13 10:12:00 -05:00
YPOQ
23f6567872 Fixes defibs/watertanks/gatling lasers (#37792) 2018-05-13 06:13:45 -05:00
FrozenGuy5
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
XDTM
5847268db3 Linked teleporters now teleport to the hub instead of the power station (#37684) 2018-05-13 06:13:27 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
ee9e96106e Merge pull request #6717 from Citadel-Station-13/upstream-merge-37742 
[MIRROR] spellig fix
 2018-05-13 03:28:39 -05:00
LetterJay
80aad142a4 Merge branch 'master' into upstream-merge-37406 2018-05-13 03:28:37 -05:00
LetterJay
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
LetterJay
646403e6e1 Merge pull request #6715 from Citadel-Station-13/upstream-merge-37772 
[MIRROR] Fixes morphs
 2018-05-12 21:37:34 -05:00
LetterJay
cbfa3053ee Merge pull request #6692 from Citadel-Station-13/upstream-merge-37558 
[MIRROR] Anomaly Armour Research
 2018-05-12 21:36:51 -05:00
AnturK
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
Mickyan
b11e600cff Makes gauze deconstructable into cloth 2018-05-12 19:15:32 -05:00
81Denton
8463204549 Runtime: fixes RTG power, adjusts pipenet, adds debug chem dispensers 2018-05-12 18:53:59 -05:00
81Denton
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
Grandmother of 50
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
LetterJay
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
LetterJay
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