Commit Graph

18615 Commits

Author SHA1 Message Date
Poojawa a987caabb4 better ambient color to match 2018-10-05 22:20:37 -05:00
Poojawa 5900eed70b Revert "Sound prefs def should work this time, holy fuck"
This reverts commit 22c667f408.
2018-10-05 15:44:42 -05:00
Poojawa 1a2e327bc6 recolors air alarm green status to blue 2018-10-05 15:20:12 -05:00
Poojawa 22c667f408 Sound prefs def should work this time, holy fuck 2018-10-04 20:44:55 -05:00
deathride58 212187620b Merge pull request #7599 from Poojawa/override-override
Digitigrade Uniforms from Oracle
2018-09-29 21:30:12 -04:00
deathride58 cbbbc616e5 Merge pull request #7601 from Citadel-Station-13/cl
Changelog.bat.jpg.html.exe.mp4.wav.ogg.zip
2018-09-29 03:15:31 -04:00
deathride58 2221a3a0d3 Merge pull request #7586 from Poojawa/modular_cit_cleaning
Cleans up Modular_citadel
2018-09-29 01:40:59 -04:00
Poojawa f2faf66586 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning 2018-09-28 22:09:19 -05:00
CitadelStationBot a1bd46f153 Automatic changelog generation for PR #7600 [ci skip] 2018-09-28 19:21:51 -05:00
deathride58 141e47ea66 Merge pull request #7600 from Poojawa/fire_alarm_vis
Fire Alarms are visible in the dark
2018-09-28 20:21:49 -04:00
Poojawa 729790f9d3 Overhauls some code, double checks uniforms 2018-09-28 03:54:57 -05:00
Poojawa 0bb40b3317 removes strobe effect 2018-09-28 02:09:56 -05:00
Poojawa e4cdb0c853 Merge branch 'master' into override-override 2018-09-28 01:49:35 -05:00
deathride58 d73c835fcb fixes header regressions 2018-09-27 21:32:55 -04:00
CitadelStationBot 7740369d10 Automatic changelog generation for PR #7592 [ci skip] 2018-09-27 20:29:41 -05:00
deathride58 ebd6ac985e Merge pull request #7592 from Poojawa/digishoes
Digitigrade Shoes
2018-09-27 21:29:39 -04:00
LetterJay eb4ccb7120 Merge pull request #7597 from Invader4352/InvaderBranch
Everything is finally done regarding my personal items, i sprited and…
2018-09-27 20:21:40 -05:00
Poojawa dec6fec1ab Update firealarm.dm 2018-09-27 15:37:07 -05:00
Invader4352 0f4d060cb6 this is the fix of that goof I made 2018-09-27 11:50:17 -04:00
Invader4352 42aae3932e updated version of the pull following the advise of comments, also checking if the description of an item in custom_items.dm is carrying over 2018-09-27 11:39:10 -04:00
CitadelStationBot 80cf610b2f cl 2018-09-27 09:02:18 -04:00
Poojawa 7a41dfef26 Fire Alarms are visible in the dark 2018-09-27 07:17:39 -05:00
Poojawa 2daa197605 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override 2018-09-27 05:09:23 -05:00
Poojawa 70d969c5cf Enables Digitigrade jumpsuit wearing 2018-09-27 05:08:39 -05:00
Invader4352 61f6bf085f Everything is finally done regarding my personal items, i sprited and coded them all and lost my mind a couple times cuz i had to re do it 3 times, then one of my files locked up, yadda yadda, fixed that, re did everything. EVERYTHING IS FUNCTIONING NORMALLY. ive added my personal items of a set of tails, ears, and a robe to go with them 2018-09-27 03:00:24 -04:00
CitadelStationBot 1b26196c52 Automatic changelog generation for PR #7583 [ci skip] 2018-09-27 00:36:16 -05:00
deathride58 9eda592c9e Merge pull request #7583 from izzyinbox/expose-genitals-tweak
Adds option to hide individual genitals without clothes
2018-09-27 01:36:14 -04:00
deathride58 7417f0ce69 Merge pull request #7572 from Tupinambis/spaceisbad
Alien ruin space turf fix.
2018-09-26 22:24:05 -04:00
CitadelStationBot 6806ed32ed Automatic changelog generation for PR #7569 [ci skip] 2018-09-26 21:23:49 -05:00
deathride58 c6874eccff Merge pull request #7569 from Tupinambis/HoSTelebaton
The HoS starts with a telebaton instead of a stunbaton.
2018-09-26 22:23:46 -04:00
Poojawa 3009e8085f Reduces Station aquirable stamina heals (#7593) 2018-09-26 12:38:49 -07:00
Poojawa 4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
CitadelStationBot 750cf22355 Automatic changelog generation for PR #7587 [ci skip] 2018-09-26 14:25:52 -05:00
deathride58 499eaae1b4 Merge pull request #7587 from Poojawa/vore-moods
Vore based mood events
2018-09-26 15:25:50 -04:00
deathride58 7b4c5658e5 Merge pull request #7566 from Poojawa/action-buff
Buffs Action, Promotes fun
2018-09-26 15:24:58 -04:00
deathride58 a431a83eeb Merge pull request #7565 from Citadel-Station-13/kevinz000-patch-2
Raises bombcap
2018-09-26 15:23:49 -04:00
CitadelStationBot 21fa54cb04 Automatic changelog generation for PR #7560 [ci skip] 2018-09-26 14:23:38 -05:00
deathride58 5f81f249ca Merge pull request #7560 from izzyinbox/big-admin-pms
Changes admin-pm input type from single-line text to multi-line message
2018-09-26 15:23:36 -04:00
CitadelStationBot e02ff6f243 Automatic changelog generation for PR #7559 [ci skip] 2018-09-26 14:22:35 -05:00
deathride58 6a6a1dffaa Merge pull request #7559 from Poojawa/APC-fix
Fixes APCs in maint rebuilds
2018-09-26 15:22:33 -04:00
CitadelStationBot cdc823c7b6 Automatic changelog generation for PR #7582 [ci skip] 2018-09-26 14:16:15 -05:00
izzyinbox 9a98b92c58 fixes tennis ball equip slots (#7582) 2018-09-26 12:16:13 -07:00
Trilbyspaceclone 0496c64459 Fixes lack of door stuck (#7574) 2018-09-26 12:15:46 -07:00
CitadelStationBot 17028aa382 Automatic changelog generation for PR #7567 [ci skip] 2018-09-26 14:15:19 -05:00
deathride58 944de1d507 TAKE OFF THE HARDCODED BLACKLIST. STOP HAVING THE SPECIES BE CLOSED (#7567) 2018-09-26 12:15:17 -07:00
Ignari-Coldstorm 967a535aeb New Reagent, Universalizes Survival Medipen (#7570)
* New Reagent, Universalizes Survival Medipen

Adds an alternate regenerative jelly for the survival medipens used in mining. Replaces the tricord and omnizine in medipens with 15u of Neo Jelly. Makes medipens finally useful for slime miners. When ODed on Neo Jelly, causes heavy brute/burn and minor oxyloss and causes no toxin damage.

* code alter

adds * to the REM.

* additional code fix

removes the M.adjustToxLoss line, and corrects code text to 52 units injected, from 57.
2018-09-26 12:07:00 -07:00
Trilbyspaceclone d6876446dd Removes armor form Fed Officer Cap (#7576)
_*Lets give everone armor at shift start!*_
2018-09-26 12:06:34 -07:00
Trilbyspaceclone e494bbb3e3 Adds in other medical kits for miners to buy! (Nerfs brute treatment kit cost from 600 to 800 too) (#7553)
* Adds in other medical kits for miners to buy!(Buffs cost as well)

* Shit
2018-09-26 12:06:14 -07:00
Poojawa dfe56bbfc2 Removes Ashwalker abilities to wear shoes 2018-09-26 13:00:40 -05:00
Poojawa ca7dd3b440 Update furrypeople.dm 2018-09-26 09:02:37 -05:00