shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,706 Commits 5 Branches 0 Tags
ceea41b5fe30ef91b7cc190f276e01014c034d08
Commit Graph

1762 Commits

Author SHA1 Message Date
CitadelStationBot
e1823e1a40 [MIRROR] You can now non-violently place people on tables (#5891) 
* You can now non-violently place people on tables (#36150)

* You can now non-violently place people on tables
 2018-03-10 07:43:14 -06:00
CitadelStationBot
a999863e5c [MIRROR] Fixes mirror var desync (#5883) 
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
 2018-03-10 07:17:52 -06:00
deathride58
a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
deathride58
2c34acc034 Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475 
[MIRROR] [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
 2018-03-09 20:36:58 +00:00
deathride58
a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
deathride58
bc5447d97b Merge pull request #5857 from Citadel-Station-13/upstream-merge-35947 
[MIRROR] [READY] NTNet airlocks
 2018-03-09 19:24:35 +00:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070 
[MIRROR] Beacons are no longer radios
 2018-03-09 18:41:05 +00:00
deathride58
1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858 
[MIRROR] Mushroom people, revived!
 2018-03-09 18:37:29 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer 
Reverts crybaby inducer also does the sync things
 2018-03-09 18:36:42 +00:00
Dax Dupont
27ff0a4f28 Display cases can now have a list where to randomly spawn items from (#36058) 
* Adds allowing display cases to pick from a random list

Keeps compatibility with older maps and moves trophy/plaque message to all display cases

* A bit more legible

* Refactors statues tool interaction code

* Don't override it already exists

* done
 2018-03-09 02:17:36 -06:00
ACCount
f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
Qustinnus
68757f1b44 Small moodie balance changes 2018-03-07 22:39:39 -06:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
kevinz000
91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -06:00
Poojawa
57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Poojawa
95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
Poojawa
86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
CitadelStationBot
766b85908e [MIRROR] Adds the Ancient Cloning Lab ruin (#5814) 
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
 2018-03-05 15:20:49 -06:00
CitadelStationBot
848b12db64 [MIRROR] [READY]Hostile mobs can attack assemblies (#5821) 
* [READY]Hostile mobs can attack assemblies (#36157)

* new fenotype

* attack

* Update items.dm

* Update assemblies.dm

* Update assemblies.dm

* Update items.dm

* [READY]Hostile mobs can attack assemblies
 2018-03-05 14:38:30 -06:00
CitadelStationBot
de97c9653a [MIRROR] SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD (#5792) 
* SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD

* Update fitness.dm

* fixes compile issue
 2018-03-05 12:37:40 -06:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710) 
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
 2018-03-05 12:34:01 -06:00
deathride58
318481e62d Merge pull request #5804 from Citadel-Station-13/upstream-merge-36095 
[MIRROR] Makes blood rage more clear
 2018-03-05 03:17:54 +00:00
deathride58
fe25e77586 Merge pull request #5798 from Citadel-Station-13/upstream-merge-36116 
[MIRROR] Implants that grant spells to their owners, for adminbus
 2018-03-05 02:45:59 +00:00
deathride58
fc4612fe93 Merge pull request #5797 from Citadel-Station-13/upstream-merge-36071 
[MIRROR] Advanced roasting sticks, for cooking sausages
 2018-03-05 02:45:33 +00:00
Buggy123
3350d145f8 Makes blood rage more clear (#36095) 
* Makes blood rage more clear

* Makes blood contract more clear

* Fixes minor span class error.
 2018-03-04 17:33:44 -06:00
vuonojenmustaturska
f3ad4b932d Implants that grant spells to their owners, for adminbus (#36116) 
* badmin implants

* honk
 2018-03-04 15:43:37 -06:00
vuonojenmustaturska
e849ab23aa Advanced roasting sticks, for cooking sausages (#36071) 
* stick

* a commit

* almost forgot something

* seems to compile
 2018-03-04 15:41:23 -06:00
kevinz000
e186825f20 Fixes transforming weapons runtiming due to no butchering component (#36057) 
* Transformation weapon fix

* Infact lets fix this too
 2018-03-04 14:58:22 -06:00
Poojawa
61b121a4c9 Dogborg fixes, Borg construction animations! (#5725) 
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
 2018-03-04 11:53:48 -06:00
LetterJay
1c002eba46 Merge pull request #5776 from Citadel-Station-13/upstream-merge-36087 
[MIRROR] Proper removal of chem implant action buttons
 2018-03-04 00:36:47 -06:00
Poojawa
b98fb70da8 Fixes Tesla Coil Circuits and contruction 2018-03-03 22:28:55 -06:00
LetterJay
567bb359ef Merge pull request #5751 from Citadel-Station-13/upstream-merge-35968 
[MIRROR] Makes machines constructable either anchored or unanchored
 2018-03-03 15:06:37 -06:00
kevinz000
0e22fe7660 Chem implants can no longer be activated by action button (#36087) 2018-03-03 06:12:06 -06:00
LetterJay
4c6dbcc85a Merge pull request #5770 from Citadel-Station-13/upstream-merge-36046 
[MIRROR] Dice icon name and desc change
 2018-03-03 02:46:35 -06:00
Slignerd
fa81e27676 d (#36046) 
Dice icon name and desc change
 2018-03-03 00:31:35 -06:00
Tad Hardesty
8fe572acde Merge pull request #36054 from AutomaticFrenzy/patch/fancy-tables-2 
Fix placement of fancy tables in the editor
 2018-03-03 00:31:27 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440 
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
 2018-03-02 23:37:41 -06:00
CitadelStationBot
75b038511c [MIRROR] Alternative PR to brass apples: Adds bronze sheets (#5758) 
* Alternative PR to brass apples: Adds bronze sheets (#35874)

* Adds bronze sheets

* nope!

* Alternative PR to brass apples: Adds bronze sheets
 2018-03-02 20:07:39 -06:00
CitadelStationBot
190c964234 [MIRROR] C4 logging now shows correct location (#5748) 
* C4 logging now shows correct location (#36047)

* makes c4 log correct location

* C4 logging now shows correct location
 2018-03-02 18:35:21 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
BordListian
07270c198f Makes machines constructable either anchored or unanchored (#35968) 
* - Makes machines constructable either anchored or unanchored if the board allows it

* - Tesla Coils connect to the network if anchored
 2018-03-02 14:38:02 -06:00
CitadelStationBot
78708a3582 [MIRROR] Fix icon of black fancy table in editor (#5735) 
* Fix icon of black fancy table in editor

* Fix icon of black fancy table in editor
 2018-02-28 19:41:44 -06:00
CitadelStationBot
9b598e388c [MIRROR] Fixes Cyborg Defib units (#5734) 
* Fixes Cyborg Defib units (#36012)

* Fixes Cyborg Defib units

* Update defib.dm

* Fixes Cyborg Defibs

make it check for a false, not a true

* Fixes Cyborg Defib units
 2018-02-28 19:30:41 -06:00
CitadelStationBot
a53e395606 [MIRROR] Tesla Corona Analyzers (#5726) 
* Tesla Corona Analyzers (#35965)

* Tesla Corona Analyzers

Generate points to make up for no bomb production on maps like Pubby

* Silly me, not Aurora, but Corona

* Adds sprites to the new mode

* new sprites! credit to... me!

* Further sprite tweaks.

* Tesla Corona Analyzers
 2018-02-27 07:41:38 -06:00
CitadelStationBot
f7ade14cf7 [MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723) 
* A Nar-Sie Plushie can be used an an extra invoker now! (#35932)

* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm

* A Nar-Sie Plushie can be used an an extra invoker now!
 2018-02-27 05:03:07 -06:00
CitadelStationBot
749f8c4e5c [MIRROR] Revert "Mekhi goes on the table" (#5715) 
* Merge pull request #35980 from kevinz000/revert-35661-patch-483

Revert "Mekhi goes on the table"

* Revert "Mekhi goes on the table"
 2018-02-26 02:38:53 -08:00