Commit Graph

3515 Commits

Author SHA1 Message Date
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -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
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788)
* Clean up all sorts of crap, mostly defines

* fixes compile errors
2018-03-05 13:23:28 -06:00
CitadelStationBot
2a161f4727 [MIRROR] Fix brains in MMIs being unable to pilot mechs (#5808)
* Merge pull request #36128 from AutomaticFrenzy/patch/brainmech

Fix brains in MMIs being unable to pilot mechs

* Fix brains in MMIs being unable to pilot mechs
2018-03-05 13:01:18 -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
4b59a31a58 Merge pull request #5805 from Citadel-Station-13/upstream-merge-35894
[MIRROR] Refactors construction datums into components
2018-03-05 03:18:21 +00: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
ACCount
07e3c61067 Refactors construction datums into components (#35894) 2018-03-04 17:52:14 -06: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
CitadelStationBot
0b07e1772a [MIRROR] Fix N^2 behavior in roundstart logout report (#5708)
* Fix N^2 behavior in roundstart logout report (#35862)

* Fix N^2 behavior in roundstart logout report

* Skip mobs which have never had a mind

* Fix N^2 behavior in roundstart logout report

* wew
2018-03-04 12:27:06 -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
LetterJay
f467484236 Merge pull request #5754 from Citadel-Station-13/upstream-merge-35485
[MIRROR] Antagonist reputation system
2018-03-04 00:31:41 -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
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -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
2c5b8a586b [MIRROR] Operating computers now display required surgery chems (#5701)
* Operating computers now display required surgery chems

* Rebuilds tgui
2018-02-27 05:05:02 -06:00
CitadelStationBot
5f6c41fa30 [MIRROR] Ports more operations to "tool_act" (#5718)
* Merge pull request #35854 from ACCount12/more_tool_act

Ports more operations to "tool_act"

* Ports more operations to "tool_act"
2018-02-27 05:04:27 -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
Poojawa
f7f3a600bd Removes Golem access to the station (#5692) 2018-02-26 00:20:37 -06:00
LetterJay
5978733f93 Merge pull request #5709 from Citadel-Station-13/upstream-merge-35977
[MIRROR] Fix bogus var access
2018-02-25 16:59:48 -06:00
LetterJay
d2607c0654 Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639
[MIRROR] Refactors anti-magic into a component
2018-02-25 16:59:38 -06:00
deathride58
c7760707e6 Update game_mode.dm 2018-02-25 16:43:54 -05:00
Tad Hardesty
3790df44e5 Fix bogus var access 2018-02-25 15:24:46 -06:00
Ashe Higgs
a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-25 14:50:29 -06:00
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
CitadelStationBot
58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634)
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
2018-02-24 09:35:48 -06:00
CitadelStationBot
913e94c128 [MIRROR] Black Fedora opens its inventory on-click like the Detective's Fedora (#5689)
* Black Fedora opens its inventory on-click like the Detective's Fedora (#35891)

* Black Fedora opens its inventory on-click like the Detective's Fedora

Instead of having to drag the sprite to your character to access its inventory, behaves the same as the Detective's Fedora opening its container on click. Considering some dets prefer the black variation for noir flavour rather than the brown standard one they just have to pass his flask from one hat to another.
I had either this in mind or creating a new black detective's fedora variant on the det's cabinet that also had the flask inside it.

The only other item affected by this, if I'm not mistaken, is the improper CentCom hat.

* Update internal.dm

Removed the <priority> line altogether to trim the code

* Black Fedora opens its inventory on-click like the Detective's Fedora
2018-02-24 07:02:57 -06:00