Commit Graph
4784 Commits
Author SHA1 Message Date
JohnandGitHub 221404bffb cleaned up some things 2017-10-03 01:42:18 -05:00
Daniel0MclovinandGitHub d4321ac0b5 Accidentally put a comma 2017-10-01 17:26:45 -05:00
Daniel0MclovinandGitHub 2d835e1d73 Nerfed overall healing
dialed down to 0.7
2017-10-01 17:25:20 -05:00
Daniel0MclovinandGitHub d3ae434b56 Changed a few stats
Darkness now does oxy damage and slight toxin, added a bit more heat mod, no longer heals toxin damage, oxygen loss healing nerfed. Can eat in the dark to try to combat starvation, added slight toxin damage to make it harder to stay in the dark with a shit ton of food.
2017-10-01 17:20:44 -05:00
Daniel0MclovinandGitHub 7054cf01ea changed a few 1's to TRUE's, removed food prefs 2017-09-28 20:02:17 -05:00
Daniel0Mclovin fa9933a80b Podpeople as roundstart
Essentially it allows podmen to be roundstart along with editing them so they take slightly more fire damage and more damage from plant-b-gone
2017-09-23 16:59:58 -05:00
LetterJayandGitHub ef79e47884 Update merge-upstream-pull-request.sh 2017-09-05 17:00:16 -05:00
CitadelStationBot 06437a49e6 Automatic changelog generation for PR #2592 [ci skip] 2017-09-05 15:57:21 -05:00
LetterJayandGitHub 737c8446c1 Merge pull request #2592 from Citadel-Station-13/ProperDisable
Disables the swarmer events for now
2017-09-05 15:57:19 -05:00
PoojawaandGitHub 9bca718151 Fixes prey digestion noises and loop (#2616) 2017-09-05 12:53:35 -05:00
Poojawa ef83a2db86 enables sabresune but locked for reason. 2017-09-05 07:33:55 -05:00
PoojawaandGitHub 3a76fdc2e9 Update supply.dm 2017-09-04 21:26:19 -05:00
Poojawa 32742f0b53 fixes skunk tails too 2017-09-04 09:28:50 -05:00
PoojawaandGitHub 362b4b5a16 Fixes Poly (#2598) 2017-09-04 09:08:25 -05:00
PoojawaandGitHub 5f1d88ffeb Revert "[MIRROR] Port material containers to datum components" (#2597)
* Revert "sprite fix on kitsune tails"

This reverts commit 44d5b21a43.

* Revert "Update vg_clothing_packs.dm (#2591)"

This reverts commit 7f46280d6b.

* Revert "Automatic changelog generation for PR #2590 [ci skip]"

This reverts commit 201e07033f.

* Revert "[MIRROR] Gives the detective a mass spectrometer (#2590)"

This reverts commit 5c98b9a13b.

* Revert "Quick sync (#2587)"

This reverts commit 92e055be97.

* Revert "Automatic changelog generation for PR #2557 [ci skip]"

This reverts commit 241a10d88d.

* Revert "Decreases hacked ai module cost (#2557)"

This reverts commit d959b7538a.

* Revert "[MIRROR] Port material containers to datum components (#2562)"

This reverts commit 32300086d5.
2017-09-04 09:07:40 -05:00
Poojawa f39bf40e76 Fixes rabbit ears 2017-09-04 09:07:22 -05:00
Poojawa 44d5b21a43 sprite fix on kitsune tails 2017-09-04 05:59:42 -05:00
LetterJay 2f95892d6b I feel like it's more appropriate to disable them via vars instead of flatout commenting the entire dm file out. I also feel like it may be better to take another look at these instead of removing them outright anyway. 2017-09-04 05:27:32 -05:00
PoojawaandGitHub 7f46280d6b Update vg_clothing_packs.dm (#2591) 2017-09-04 04:47:20 -05:00
CitadelStationBot 201e07033f Automatic changelog generation for PR #2590 [ci skip] 2017-09-04 04:39:08 -05:00
CitadelStationBotandPoojawa 5c98b9a13b [MIRROR] Gives the detective a mass spectrometer (#2590)
* Gives the detective a mass spectrometer

* Actually adds it
2017-09-04 04:39:07 -05:00
LetterJayandPoojawa 92e055be97 Quick sync (#2587)
* sync since the mirror was down

* fucking byond

* can't forget these
2017-09-04 04:38:49 -05:00
CitadelStationBot 241a10d88d Automatic changelog generation for PR #2557 [ci skip] 2017-09-04 04:14:49 -05:00
CitadelStationBotandPoojawa d959b7538a Decreases hacked ai module cost (#2557) 2017-09-04 04:14:48 -05:00
CitadelStationBotandPoojawa 32300086d5 [MIRROR] Port material containers to datum components (#2562)
* Port material containers to datum components

* Fixes Rej
2017-09-04 04:08:42 -05:00
PoojawaandGitHub a4c92a8155 Update radiation_storm.dm 2017-09-04 03:12:51 -05:00
PoojawaandGitHub 2c8e2f0679 New tails, new ears, new looks (#2585)
* Sabresune markings and tail

also a few other fixes

* bluh

* kitsune tails and final tweaks

* enables taur on all other species, because why not
2017-09-04 02:48:13 -05:00
PoojawaandGitHub f0b01508bb Removes swarmers from random events (#2584)
Greytide: Blue lightning meme is dead.
2017-09-04 02:47:56 -05:00
PoojawaandGitHub 8767fa299b Fixes headpatting *wag and Vore spaceworthiness (#2582)
* no you're not supposed to die in a gut

* Re added tailwagging when patted

* adjust sounds, adding belly noises mode

* lowers sounds.

* Adds Noisy belly mode
2017-09-04 02:47:39 -05:00
CitadelStationBotandPoojawa e353091c47 [MIRROR] Fixes shield blobs not blocking atmos (#2575)
* Fixes shield blobs not blocking atmos

* atmosia blocking
2017-09-04 02:47:09 -05:00
CitadelStationBotandPoojawa 2ab11de906 [MIRROR] Removes a Redundant Check (#2572)
* Removes a Redundant Check

* Removes redundant check
2017-09-04 02:41:41 -05:00
CitadelStationBot e4101c8f6c Automatic changelog generation for PR #2568 [ci skip] 2017-09-04 02:41:17 -05:00
CitadelStationBotandPoojawa ad43c951b8 [MIRROR] Slime people can eat anything again (#2568)
* Slime people can eat anything again

* slimes can eat. Furry food prefs
2017-09-04 02:41:15 -05:00
kevinz000andPoojawa c00d7aa3f6 Update ears.dm (#2489) 2017-09-04 02:39:20 -05:00
CitadelStationBot dccffe6e74 Automatic changelog generation for PR #2559 [ci skip] 2017-09-04 01:36:01 -05:00
CitadelStationBotandPoojawa 9b00f12ba0 Makes the shuttle code a little bit more robust by removing a snowflake loop (#2559) 2017-09-04 01:36:00 -05:00
CitadelStationBotandkevinz000 e7a6c2d09f [MIRROR] Fixes anti-drop exploit (#2589)
* Fixes anti-drop exploit

* Update augments_internal.dm
2017-09-03 14:59:30 -07:00
CitadelStationBot 12dffed71d Automatic changelog generation for PR #2588 [ci skip] 2017-09-03 11:54:04 -05:00
LetterJayandGitHub b944b8b7c4 Merge pull request #2588 from Citadel-Station-13/GuilmonFixRedux
really fixes guilmons this time
2017-09-03 11:54:03 -05:00
LetterJay e0eeda1f63 really fixes guilmons this time 2017-09-03 11:37:15 -05:00
CitadelStationBot ac1d6080c9 Fix the mirror script 2017-09-03 10:54:11 -05:00
CitadelStationBot 6547c77ed6 Fixed the mirror script 2017-09-03 06:20:21 -05:00
LetterJay 92b7af7e14 commit 2017-09-02 23:39:20 -05:00
LetterJayandGitHub 9c857576b4 Merge pull request #2581 from Citadel-Station-13/ItemAddition
Everyone now spawns with pulserifles
2017-09-02 07:59:09 -05:00
LetterJayandGitHub 0947177b6e Update tgstation.dme 2017-09-02 07:58:53 -05:00
CitadelStationBot 5e75fc6f27 Automatic changelog generation for PR #2442 [ci skip] 2017-09-02 07:49:04 -05:00
LetterJayandGitHub 8aa7dbdbb6 Merge pull request #2442 from Citadel-Station-13/upstream-merge-29105
[MIRROR] Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
2017-09-02 07:49:03 -05:00
LetterJayandGitHub 28b64099a7 Delete cebusoap.dmi 2017-09-02 07:48:32 -05:00
LetterJay f8413517bb testing 2017-09-02 07:43:34 -05:00
LetterJayandGitHub 7aa042cff1 Update randomverbs.dm 2017-09-02 07:33:45 -05:00