cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,719 Commits 6 Branches 0 Tags
d2da0e1f380b8b7ee910fac7345d7ac4f55f2f5a
Commit Graph

35396 Commits

Author SHA1 Message Date
Novacat
715cab9bfb Update turf_changing.dm 2019-10-14 21:50:07 -04:00
Unknown
404f84dbd4 Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-10-14 21:29:45 -04:00
Novacat
410d560676 Merge pull request #6052 from Poojawa/lewd-sounds 
New optional Vore sounds, release and internal loop
 2019-10-14 01:30:51 -04:00
Unknown
9fbb5c247e Glucose Container 2019-10-13 16:14:59 -04:00
Heroman
3e31046aef Fixes file discrepancy for autolathe ammo recipies 2019-10-14 05:35:30 +10:00
Poojawa
9fe126e53e swhat I gets for not compiling a 'ohwait' check 2019-10-13 03:18:58 -05:00
Poojawa
8c059c9403 double check to stop that sound loop on release 2019-10-13 02:15:44 -05:00
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05:00
Novacat
3351edd916 Update turf_changing.dm 2019-10-12 12:21:38 -04:00
Unknown
e2ea09a1be Fixes open space spawning over sky tiles 2019-10-12 12:10:04 -04:00
DigitalSquirrel95
30f751b23f Update vote.dm 2019-10-11 02:29:58 -04:00
DigitalSquirrel95
bec4591556 Changes the crew transfer message to be more IC friendly. 
A simple change that changes the crew transfer vote message to something that implies the crew is voting for extra work on their PDAs.  This makes the crew transfer make a bit more sense in character, because as it stands, our characters are currently coming to work not really knowing when they get off work.

Direct port of this: https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/572
 2019-10-11 01:43:00 -04:00
Novacat
df05103c06 Merge pull request #6042 from VOREStation/upstream-merge-6476 
[MIRROR] Printers print Fields correctly now.
 2019-10-08 12:50:37 -04:00
Atermonera
ea876b37cf Merge pull request #6476 from Hawk-v3/master 
Printers print Fields correctly now.
 2019-10-08 04:22:16 -04:00
Atermonera
93bbae11e7 Merge pull request #6475 from R1f72r/Phoronboreupgrade 
Allows you to upgrade Phoron Bore with manipulators
 2019-10-08 04:22:06 -04:00
Novacat
bac8237fb2 Update prometheans.dm 2019-10-08 01:01:31 -04:00
Fel
0bab8c2c8c Prometheans clean everything, not just the tile they're on. 2019-10-08 00:52:47 -04:00
Novacat
369b9a0914 Merge pull request #6039 from Screemonster/chimeratweaks 
chimera examinetext
 2019-10-07 15:51:18 -04:00
Screemonster
513f59ea92 chimera examinetext 2019-10-06 20:14:26 +01:00
Novacat
a6654d7bd4 Merge pull request #6035 from VOREStation/upstream-merge-6471 
[MIRROR] Blind port of Bay Radiation Subsystem
 2019-10-06 14:30:59 -04:00
Unknown
daefe0ba5b Why were these still here 2019-10-06 14:19:08 -04:00
Unknown
dade2aa80b Conflict Resolution 2019-10-06 13:12:11 -04:00
Novacat
149162a1e7 Merge pull request #6029 from Rykka-Stormheart/shep-dev-catalogue 
Adds Cataloguer Data to multiple simple_mobs that lacked it
 2019-10-06 03:50:32 -04:00
Novacat
d868f99059 Merge pull request #6037 from VOREStation/upstream-merge-6473 
[MIRROR] Port weight/body types to traits
 2019-10-06 03:48:19 -04:00
Atermonera
5a3398daec Merge pull request #6473 from Woodratt/09272019_weightbodytype 
Port weight/body types to traits
 2019-10-06 03:34:05 -04:00
Atermonera
cd34901747 Merge pull request #6474 from Cerebulon/newsoct19 
June-October News Update
 2019-10-06 03:33:55 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Novacat
0dceea0b95 Update corrupt_hounds.dm 2019-10-05 22:56:15 -04:00
Novacat
2ae04b4264 Fixes typo in flexitac melee protection (#6470) 2019-10-05 21:12:21 -04:00
Novacat
364b92bf0a Update golem.dm 2019-10-05 15:01:44 -04:00
Rykka
59f58ff365 Polaris fucking edits. hurrah. WATCH IT BREAK FILEDIFF AGAIN 2019-10-05 12:36:40 -06:00
Rykka
14f8f1b8d5 Hopefully fix filediffs 2019-10-05 12:07:22 -06:00
Novacat
782b4f3e67 Update sky_vr.dm 2019-10-03 22:52:36 -04:00
Unknown
dc050cc790 Fixes falling phased kin 2019-10-03 22:45:55 -04:00
Unknown
0c0bc6773d Fixes issue with gateway landmarks 2019-10-02 01:35:34 -04:00
Unknown
39e9d1472e Adds Centcomm flag to CC Headsets 2019-10-01 21:29:19 -04:00
Unknown
3be682a30d Gives CC Access to Explorer comms 2019-10-01 20:58:05 -04:00
Unknown
80ce44c5c8 New sprite for portal gateway 2019-10-01 20:41:16 -04:00
Novacat
c9c2dd0d81 Merge pull request #6009 from Verkister/prottiestuffs 
Some Protean fixes
 2019-10-01 03:41:34 -04:00
Verkister
855d795357 Some Protean fixes 
-Fixes protean regeneration not working at all.
-Fixes not being able to get metal as blob.
-Fixes unblobbing as custom size breaking vertical offset.
-Adds a general use loadout fluff vest planned for a prottie char.
-Fixes blobmob being slow due to mob update movement delays.
-Gives protties trasheat verb.
 2019-10-01 10:30:29 +03:00
Unknown
fdca4f7554 Master Runtime Fix 2019-10-01 03:09:58 -04:00
Novacat
c4ab8da1a8 Merge pull request #6005 from Novacat/nova-ert 
Minor Event Goodies
 2019-10-01 02:52:40 -04:00
Atermonera
e4abffb8a4 Merge pull request #6469 from Verkister/patch-23 
Fixes runtime cascade on advanced locator circuit
 2019-10-01 02:38:09 -04:00
Unknown
0ba3f037f5 Minor Event Stuff 2019-09-30 20:11:49 -04:00
Atermonera
7f71c276b3 Merge pull request #6464 from Heroman3003/telemaster 
Makes telecomm machinery constructible/deconstructible like normal machines
 2019-09-29 22:19:00 -04:00
Heroman
341520e766 Makes Melanie's skeleton indigestible 2019-09-29 18:49:45 +10:00
Heroman
f6f2acca6f Adds Melanie's Skeleton 2019-09-29 14:28:56 +10:00
Novacat
2e5f7d5015 Merge pull request #5995 from VOREStation/Verkister-patch-10 
Fixes the canary runtime on human vores
 2019-09-28 16:02:42 -04:00
Novacat
1f70675347 Merge pull request #5994 from VOREStation/Verkister-patch-9 
Makes stasis cages use the new sprites
 2019-09-28 16:02:29 -04:00
Verkister
44dac8089d Fixes the canary runtime on human vores 2019-09-28 22:28:03 +03:00