Commit Graph

13460 Commits

Author SHA1 Message Date
Razgriz
1d86decba9 Merge pull request #4096 from radiantAurora/master
De-crappifies Biofuel Processor
2022-04-21 00:53:40 -07:00
Casey
29d1a921fb Merge pull request #12791 from Very-Soft/adjustprefs
Adjust default prefs
2022-04-18 20:53:33 +00:00
Nadyr
2ce2880fe6 Merge pull request #4112 from CHOMPStation2/upstream-merge-12604
[MIRROR] [MIRROR] Allergen CE Conversion
2022-04-18 00:33:22 -04:00
Nadyr
d18312c00d Merge pull request #4107 from CHOMPStation2/upstream-merge-12770
[MIRROR] Adds transcore ping to brainmobs
2022-04-18 00:20:17 -04:00
Nadyr
7c86fdf4b8 Merge pull request #4105 from CHOMPStation2/upstream-merge-12767
[MIRROR] Big Pharma's Blessing: Snorting Mechanics
2022-04-17 23:59:05 -04:00
Nadyr
2d6a2d1530 Merge pull request #4098 from CHOMPStation2/upstream-merge-12764
[MIRROR] Adds a disposal bin that washes clothes and sabotages vore belly save keys
2022-04-17 23:53:06 -04:00
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Nadyr
884b78b0ab Merge pull request #4102 from CHOMPStation2/upstream-merge-12725
[MIRROR] Update station_special_abilities_vr.dm
2022-04-17 23:30:28 -04:00
Nadyr
f4b6a85e9f powder that makes you say yes 2022-04-17 23:04:19 -04:00
Casey
4c301c2d58 Adds a disposal bin that washes clothes and other oddities 2022-04-17 23:04:19 -04:00
Nadyr
9262d0380e Merge pull request #4086 from CHOMPStation2/upstream-merge-12738
[MIRROR] Stumble Vore
2022-04-17 22:43:39 -04:00
Nadyr
9fb5e12db6 Merge pull request #4089 from CHOMPStation2/upstream-merge-12745
[MIRROR] Add eastern dragon taur suit sprites
2022-04-17 21:23:23 -04:00
Nadyr
6e009c29cc Merge pull request #4087 from CHOMPStation2/upstream-merge-12739
[MIRROR] Late Night Stuff
2022-04-17 21:08:17 -04:00
Nadyr
17ce609218 powder that makes you say yes 2022-04-17 19:46:36 -04:00
Casey
ec4b9bc914 Merge pull request #12604 from VOREStation/upstream-merge-8431
[MIRROR] Allergen CE Conversion
2022-04-17 22:41:03 +00:00
Nadyr
33e3a1ae3b Merge pull request #4063 from CHOMPStation2/upstream-merge-12720
[MIRROR] Update drone_items.dm Magnetic Gripper
2022-04-17 18:40:57 -04:00
Nadyr
d9a10e5716 powder that makes you say yes 2022-04-17 18:28:16 -04:00
Casey
cd6e7e7883 Merge pull request #12770 from Runa-Dacino/posibrain_transcore_notify
Adds transcore ping to brainmobs
2022-04-17 21:18:15 +00:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
54dd44b7d8 Merge pull request #12725 from liache/Liache-Winged-Flight-Patch
Update station_special_abilities_vr.dm
2022-04-17 21:14:47 +00:00
radiantAurora
805e96774e Update neutral.dm 2022-04-17 15:09:01 +01:00
radiantAurora
067e14a039 Update neutral.dm 2022-04-17 15:02:56 +01:00
Casey
e04ec9bec2 Merge pull request #12745 from CubeJackal/master
Add eastern dragon taur suit sprites
2022-04-17 09:23:17 +00:00
Casey
b9f0c0ef92 Late Night Stuff 2022-04-17 09:21:02 +00:00
Casey
f1762448de Stumble Vore 2022-04-17 09:19:54 +00:00
Razgriz
b5dff4934f Merge pull request #4066 from CHOMPStation2/Razgriz1032-patch-11
Allow morph to be killed by tasers
2022-04-14 02:06:38 -07:00
Razgriz
50684aa840 Allow morph to be killed by tasers
set taser_kill to TRUE from FALSE.
2022-04-14 00:54:18 -07:00
Casey
20b6c9e356 Merge pull request #12719 from CubeJackal/master
Adds eastern dragon taur sprite
2022-04-13 01:41:14 +00:00
Casey
3ced289415 Update drone_items.dm Magnetic Gripper 2022-04-13 01:41:09 +00:00
Razgriz
8283dbc9a2 Merge pull request #4046 from CHOMPStation2/upstream-merge-12696
[MIRROR] Makes NIFSoft vision modifiers mutually exclusive with goggle/visor based ones
2022-04-10 13:38:53 -07:00
Sk1tza
af091125c4 New RingTail 2022-04-10 00:53:32 -04:00
Casey
5c72239a85 Merge pull request #12696 from Heroman3003/vision-exclusivity
Makes NIFSoft vision modifiers mutually exclusive with goggle/visor based ones
2022-04-09 21:50:04 +00:00
Pat Warclaw
7d458af520 Renables Werebeast race.
As stated above, currently admin spawn only but can be customized and can be whitelisted in the future if necessary.
2022-04-08 03:18:03 -06:00
Razgriz
7095a222d5 Merge pull request #4029 from CHOMPStation2/upstream-merge-12671
[MIRROR] Makes mobs not spawn with id unless defined so
2022-04-07 01:00:12 -07:00
Razgriz
d311a6a8b0 Merge pull request #4028 from CHOMPStation2/upstream-merge-12672
[MIRROR] Catslug mania 3.0
2022-04-07 00:59:59 -07:00
Razgriz
1f861224a6 Merge pull request #4019 from CHOMPStation2/upstream-merge-12663
[MIRROR] Allow mobs to ventcrawl with their mobid
2022-04-07 00:53:46 -07:00
Casey
2d4cbaceac Merge pull request #12671 from Verkister/patch-113
Makes mobs not spawn with id unless defined so
2022-04-06 21:29:21 +00:00
Casey
8f3107744e Merge pull request #12672 from BonniePandora/Catslug-mania-3.0
Catslug mania 3.0
2022-04-06 21:28:13 +00:00
Verkister
83ebb91608 Earlyports mob ID fix.
Makes mob ids only spawn on mobs that should come with them rather than jamming one into every single mouse and cockroach and so on.
2022-04-06 21:25:49 +03:00
Casey
a3d4539391 Merge pull request #12663 from Very-Soft/ventcrawls
Allow mobs to ventcrawl with their mobid
2022-04-06 02:15:03 +00:00
Casey
39af7d18a2 Merge pull request #12656 from VOREStation/upstream-merge-8494
[MIRROR] Fixes runtime with turrets and viscerators
2022-04-06 00:18:19 +00:00
Nadyr
077d04b405 Merge branch 'master' into upstream-merge-12637 2022-04-04 19:59:29 -04:00
Nadyr
668750e503 Merge branch 'master' into upstream-merge-12633 2022-04-04 19:12:58 -04:00
Nadyr
267cf31e12 Merge pull request #3993 from CHOMPStation2/upstream-merge-12622
[MIRROR] Catslugs looking kinda sus?!
2022-04-04 17:53:14 -04:00
Nadyr
a121954e24 Merge pull request #3992 from CHOMPStation2/upstream-merge-12592
[MIRROR] The Grand /TG Port - Part 6
2022-04-04 17:52:53 -04:00
Nadyr
6fe5e8c1e1 Merge pull request #3991 from CHOMPStation2/upstream-merge-12579
[MIRROR] The Grand /TG Port - Part 5
2022-04-04 17:37:57 -04:00
Nadyr
9470ade7e9 Merge pull request #3974 from CHOMPStation2/upstream-merge-12573
[MIRROR] Allows Xenochimera to take Autohiss
2022-04-04 17:37:09 -04:00
Nadyr
a83b477225 Update catslug.dm 2022-04-04 17:30:45 -04:00
Nadyr
7ef023d77c powder that makes you say yes 2022-04-04 17:30:29 -04:00
Casey
c5253552c2 Catslugs looking kinda sus?! 2022-04-04 17:26:24 -04:00