Commit Graph

11740 Commits

Author SHA1 Message Date
Razgriz 4ad2efbc81 Update negative.dm 2020-09-26 17:05:37 -07:00
Razgriz 4aaf36d214 Missing close comment 2020-09-26 14:56:11 -07:00
Razgriz 54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Razgriz b74a3b62e4 Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into September2020UpstreamPull
Pull from Master
2020-09-22 00:59:03 -07:00
Braiden c55ea87e94 Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions 2020-09-19 03:03:11 -05:00
Braiden 71266ace1e added new plushies to drop lists 2020-09-19 03:03:09 -05:00
Cadyn f3a6ee715a upstream consistent 2020-09-16 01:21:26 -07:00
Nadyr d36bee1964 Merge pull request #549 from BlackMajor/Screm
Teshari's have a sound on *scream now.
2020-09-16 01:35:08 -04:00
BlackMajor 0ff8e72642 Update emote.dm 2020-09-16 17:17:21 +12:00
BlackMajor 3e0ffd8f9d funny chompstation add 2020-09-16 17:04:15 +12:00
BlackMajor ef77cb88b1 Probably should've removed the comment first 2020-09-16 14:35:16 +12:00
Cadyn b6d62ca18e Fix stripping.dm cloning issues 2020-09-15 19:34:25 -07:00
BlackMajor 70645b91dd he screm 2020-09-16 14:26:44 +12:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Shadow Quill 5702e574b2 Update 2020-09-12 19:33:59 -05:00
Shadow Quill 33d9792678 Anti Pref Breaking 2020-09-12 19:30:22 -05:00
Razgriz a542085557 Metroid update
Need help determining why the AI isn't performing functions like pouncing, latching onto head, etc
2020-09-11 13:36:10 -07:00
Razgriz f40da6b2fb Merge branch 'master' of https://github.com/CHOMPStation2/CHOMPStation2 into metroid
Master pull
2020-09-11 13:31:45 -07:00
Matica c04771f0fe Dogborg Uprising
Brings in dogborg markings for character creation! Made by skits.
2020-09-07 17:00:38 -04:00
Repede 1aed482d7d Fixes some M << to to_chat references. 2020-09-01 23:16:25 -04:00
Razgriz 85b55d8be4 Metroid evolution code
Adds code to spawn a new metroid and an ATTEMPT at transferring the mind (ckey), but the transfer is not working yet.
2020-09-01 00:07:08 -07:00
Nadyr dd034573a4 Merge pull request #524 from MisterGrimm/master
Fixing Xenomorph life cycle + numerous changes and balances.
2020-09-01 01:21:06 -04:00
Novacat 1fcb6bf337 Merge pull request #8896 from Rykka-Stormheart/shep-dev-airlock-sound-prefs
Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
2020-08-31 15:29:13 -04:00
Razgriz 21fa15c4c0 Metroids WIP
Some base files.
2020-08-31 00:38:54 -07:00
Novacat ac15f36943 Update robot.dm 2020-08-30 14:59:10 -04:00
Darlantan 56e2ed6fb5 SynxTweaks
-Fixes synx chem
-Fixes synx venom injection
-Balancing stuff
-Adds Distend Stomach ability
-Re-adds parasitism
2020-08-30 06:01:08 -04:00
Heroman3003 8174488f34 Makes borg cell replacement take priority over petting 2020-08-30 02:50:16 -04:00
Heroman c3bf4e5220 Makes rabbits not be vulpines 2020-08-30 05:32:23 +10:00
Rykka 9841414da6 Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
Self-explanatory.

Adds toggle to go back to the old-school SS13 legacy airlock sounds, including the glass windoor airlock sounds, and a toggle to disable the per-department door sounds, which some found jarring/unrealistic.

If Per-Department sounds are disabled, the department doors will use hall1o/c for open/close respectively, following maintainer-requested behavior for these doors.

This also relocates the following sounds to be inside machines/door for more consistency:
- airlock.ogg
- airlockclose.ogg
- airlockforced.ogg
- airlock_creaking.ogg
- boltsup.ogg
- boltsdown.ogg
- blastdoorclose.ogg
- blastdooropen.ogg
- windowdoor.ogg
2020-08-29 03:04:34 -04:00
Sym 0dec16535d Adding CHOMPedit to edited lines and files, with brief descriptions.
Can't believe I didn't think of doing this already.
2020-08-29 02:28:30 -04:00
Nadyr 8c9064bf06 Merge pull request #523 from loburd/LOTESTBRANCHCHOMPVORELOL
SYNX UPDATE. V1 (No disended stomach verb yet.)
2020-08-29 00:39:45 -04:00
Novacat 692afaef75 Merge pull request #8794 from KasparoVy/mane-gain
Lets Taj Hairstyles be Selected by More Species
2020-08-28 16:11:57 -04:00
loburd b984de8ca6 Update synx.dm 2020-08-28 16:00:36 -04:00
loburd 1dc3fb91ac Update synx.dm 2020-08-28 15:57:54 -04:00
Heroman ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
ShadowLarkens eac9e46615 TGUI Law Manager 2020-08-28 11:36:47 -07:00
Unknown 10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -04:00
Novacat 28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571
[MIRROR] Colony Director -> Site Manager
2020-08-28 13:17:58 -04:00
Novacat 25058122bf Merge pull request #8826 from VOREStation/upstream-merge-7555
[MIRROR] Actually adds (and TESTS) exclude_mobs parameter to visible_message
2020-08-28 13:02:03 -04:00
Novacat 33b1eb1cdb Update mob.dm 2020-08-28 12:38:16 -04:00
Sym 20bcadbec6 Fixing Xenomorph lifecycle + changes
Time to get swifty.
2020-08-28 12:29:06 -04:00
Novacat f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions
Massive Ambience and Sound Overhaul + Addition
2020-08-28 00:47:23 -04:00
Novacat 4e2038b9c0 Merge pull request #8863 from VOREStation/upstream-merge-7565
[MIRROR] Fix ventcrawling while in 0 gravity
2020-08-28 00:19:02 -04:00
Novacat e370fda424 Merge pull request #8859 from VOREStation/upstream-merge-7554
[MIRROR] Fixes turf slowdown not applying on non-water/snow turfs
2020-08-28 00:17:58 -04:00
Novacat 2dabf37c56 Merge pull request #8857 from VOREStation/upstream-merge-7553
[MIRROR] [Untested] Emotes won't be foiled by pesky capitals
2020-08-28 00:17:36 -04:00
Atermonera 57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera 21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera 109fc5259c Merge pull request #7565 from Cyantime/patch-1
Fix ventcrawling while in 0 gravity
2020-08-27 20:36:48 -04:00
Atermonera de5d1f6120 Merge pull request #7554 from Heroman3003/turfslow
Fixes turf slowdown not applying on non-water/snow turfs
2020-08-27 19:57:37 -04:00
Atermonera 5ea4c84700 Merge pull request #7553 from Shadow-Quill/patch-1
[Untested] Emotes won't be foiled by pesky capitals
2020-08-27 19:47:44 -04:00