Commit Graph

346 Commits

Author SHA1 Message Date
CitadelStationBot 0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955)
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
2018-03-15 20:50:10 -05:00
Poojawa 6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
CitadelStationBot 8dc9fcf816 [MIRROR] Fixes blindfolds blinding when not over your eyes (#5936)
* Fixes blindfolds blinding when not over your eyes (#36316)

* fixes blindfolds

* lets use ref instead then

* Fixes blindfolds blinding when not over your eyes
2018-03-13 05:45:53 -05:00
CitadelStationBot c91006c27f [MIRROR] Create ERT refactor (#5924)
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
2018-03-12 07:30:03 -05: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 df5cbc448e Fixes tinfoil hats and lengthens the time for someone else to put it on (#36019)
* Fixes tinfoil hats and lenghtens the time for someone else to put it on

* Adds some flavor to that text
2018-03-04 16:06:14 -06:00
CitadelStationBot 7cdeebab69 [MIRROR] Blindfolds properly apply blindness (#5782)
* Blindfolds properly apply blindness (#36101)

* blindfolds properly apply blindness

* covering your eyes now applies blindness

* Blindfolds properly apply blindness
2018-03-04 05:26:37 -06:00
cebutris 67bd3b3d7e White crayons no longer make gloves look latex (#36062)
* makes white crayons make white gloves, not latex

* mime subtype gloves

* Why didn't cobby think of this?

* makes mime crayons give latex gloves
2018-03-03 00:03:16 -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 bbc261952e [MIRROR] Medals now show the commendation text in the description. (#5733)
* Medals now show the commendation text in the description. (#36020)

* Medals now show the commendation text in the description

* the user is now real

* Medals now show the commendation text in the description.
2018-02-28 19:42:03 -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
MMMiracles 5493339c7d Adds Tinfoil Hats (#35665)
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
2018-02-25 18:11:48 -06:00
XDTM 493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
CitadelStationBot af2ae3d727 [MIRROR] Reverts intercept_user_move change for flightsuits (#5630)
* Merge pull request #35830 from vuonojenmustaturska/clientsignal

Reverts intercept_user_move change for flightsuits

* Reverts intercept_user_move change for flightsuits
2018-02-21 09:28:53 -06:00
oranges 91a404fca7 Merge pull request #35737 from coiax/better-italian
Italian mustache respects capital letters more
2018-02-19 22:08:17 -06:00
Poojawa c0850044a7 Flightsuit Armor adjustments (#5515)
* armor tweaks

* marks the nerfs for future generations to respect.

* Modularizes values

flags are still getting trimmed tho.

* reee
2018-02-17 18:05:26 -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
vuonojenmustaturska 6dfa89fab7 Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679)
* honk

* qdel memes
2018-02-16 00:41:04 -06:00
Jordan Brown f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
oranges 5dc3549801 Merge pull request #35542 from ShizCalev/free-spam-removal
Cleans up some duplicate canusetopic warnings
2018-02-15 20:35:03 -06:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
CitadelStationBot a60e56597c Update soft_caps.dm 2018-02-11 05:35:55 -06:00
ShizCalev f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan Brown fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
PKPenguin321 bdab8a71d9 adds italian moustache that makes you italian 2018-02-08 14:30:30 -06:00
MMMiracles 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
Poojawa e0703fcecc Removes Fun 2018-02-01 21:39:30 -06:00
Poojawa a7f0ffb6f0 modules 2018-01-31 06:56:28 -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
coiax 481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
LetterJay f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
MrDoomBringer 4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Cruix 23e5b7f396 Consolidated t-ray scanner code (#34759)
* Consolidated t-ray scanner code

* Fixed cables not showing up on t-ray scans
2018-01-22 15:45:07 -06:00
AnturK 105ff6a3bc Fixes hardsuits in templates 2018-01-15 12:36:23 -06:00
oranges 8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 04:23:03 -06:00
deathride58 d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
modularized_suicide f13426c5af many flashes?? 2018-01-07 02:07:39 -06:00
deathride58 0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967
[MIRROR] Makes the decal component handle updating inventory icons
2018-01-02 19:15:46 -06:00
LetterJay c22e0dc862 Update chameleon.dm 2018-01-02 15:48:32 -06:00
Emmett Gaines f581b2d94d Makes the decal component handle updating inventory icons 2018-01-02 15:18:31 -06:00
LetterJay 30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay 168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay d986ca1ee3 Merge pull request #4594 from Citadel-Station-13/upstream-merge-33911
[MIRROR] Adds white and rainbow gloves to the gloves/color/random selection pool
2018-01-01 04:26:56 -06:00
LetterJay 1463a442a5 Merge pull request #4596 from Citadel-Station-13/upstream-merge-33915
[MIRROR] Removes suit sensors from bural garbs
2018-01-01 04:25:37 -06:00
AnturK bbca0afa37 Fixes thermals, also drops the see invisible from thermals. (#33950) 2017-12-31 06:30:34 -06:00
LetterJay 211f3942a6 Merge branch 'master' into upstream-merge-33930 2017-12-30 13:37:52 -06:00
LetterJay c1c67ced1a Update color.dm 2017-12-30 13:37:30 -06:00
LetterJay 4d3b7ddcbd Update color.dm 2017-12-30 13:37:23 -06:00