Commit Graph

72 Commits

Author SHA1 Message Date
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 567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
deathride58 fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668
[MIRROR] Quote the armor lists
2018-02-17 19:29:50 +00:00
AnturK 3e12e1b2f6 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 10:35:55 -06:00
AnturK 993f15a415 Converting more auto_custom antagonists. (#35484)
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
2018-02-16 00:45:20 -06:00
Jordan Brown f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
Jordan Brown e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
CitadelStationBot 717da969a6 [MIRROR] Var cleanup and map fixes (#5359)
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
CitadelStationBot 7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327)
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
MMMiracles 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
CitadelStationBot 9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
81Denton 547a80eb22 [Ready] Rebalances Chameleon Kits for lowpop (#34972)
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
2018-01-27 23:21:06 -06:00
Leo 326228c43c Merge pull request #34778 from ShizCalev/pollCandidatesForMob
Fixes invalid pollCandidatesForMob args
2018-01-23 06:42:08 -06:00
AnturK 3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
deathride58 0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Armhulen 8a0aa32335 Mi-go 2017-12-17 04:11:01 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
AnturK 6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
ACCount 435e46e407 Moves some machine sprites into /machines/ folder 2017-12-05 03:24:03 -06:00
deathride58 21d5e8999c Merge branch 'master' into upstream-merge-32624 2017-12-04 17:12:53 -05:00
ShizCalev 12aa356f10 Updates some item drops to use drop_location() 2017-11-24 12:59:33 -06:00
oranges cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
Tad Hardesty 5560a557e7 Refactor ladders so that they actually work (#32797) 2017-11-20 02:05:52 -06:00
vuonojenmustaturska 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
Jordan Brown bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
LetterJay cd562a3c87 Update centcomAway.dm 2017-10-13 07:30:23 -05:00
ShizCalev 74c9b75ba1 Refactors away mission & space ruin area code. 2017-10-12 12:46:52 -05:00
AnturK 5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay 493352f680 Update stationCollision.dm 2017-10-06 22:23:31 -05:00
AnturK 848968834a Fixes outdated away code. 2017-10-06 07:10:36 -05:00
ShizCalev 849deb5e4e Cleans up more paper fluff varedits. (#30418) 2017-09-06 18:42:43 -05:00
kevinz000 5591afc9ce double wew 2017-08-29 09:53:11 -07:00
LetterJay 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot 76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156)
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot 55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
CitadelStationBot 54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
CitadelStationBot 55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot 1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
CitadelStationBot 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00