cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,874 Commits 5 Branches 0 Tags
db2e0bf71c28ebf11166e39a758cc8d9ddc04adb
Commit Graph

23775 Commits

Author SHA1 Message Date
Novacat
db2e0bf71c Merge pull request #6573 from Heroman3003/hard-safety 
Prevents resleeving sickness from affecting hardvore victims
 2020-02-14 09:35:58 -05:00
Novacat
4f4a29b5fc Merge pull request #6568 from VOREStation/stream 
Remove use of <<
 2020-02-14 09:34:12 -05:00
Novacat
1c459d7416 Merge pull request #6572 from VOREStation/upstream-merge-6689 
[MIRROR] cash registers and retail scanners show transaction totals on examine
 2020-02-14 09:33:01 -05:00
Heroman
b09c8c5a38 Prevents resleeving sickness from affecting hardvore victims 2020-02-14 10:07:02 +10:00
Atermonera
20f60c4a8b cash registers and retail scanners show transaction totals on examine (#6689) 2020-02-13 17:11:53 -05:00
Heroman3003
718feb1ebe Adds pineapple pizzabox (#6682) 2020-02-13 17:11:43 -05:00
Aronai Sieyes
641ed43b23 This one should be WRITE_LOG 2020-02-13 12:21:03 -05:00
Atermonera
cae97cf4c0 Merge pull request #6659 from Darlantanis/MetamorphicPintGlas 
Metamorphic Pint Glass
 2020-02-13 00:31:59 -05:00
Arokha Sieyes
7f1aabbf25 Weird cases where to_chat freaks out 2020-02-12 19:38:45 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Heroman
94b8236398 Fixes new tools on pupdozer being duplicated 2020-02-13 07:08:43 +10:00
Novacat
c8a8987610 Merge pull request #6524 from Heroman3003/beaconchange 
Makes syndie beacon found in xenoarch use virgo-specific subtype
 2020-02-12 10:43:24 -05:00
Novacat
448526bfdc Merge pull request #6553 from Heroman3003/log-the-prefs 
Adds logging to the breaking of devourable/feeding prefs
 2020-02-12 10:42:28 -05:00
Atermonera
cb75ffdc72 Very low levels of radiation are no longer harmful (#6684) 2020-02-12 00:15:55 -05:00
Heroman
3f75b09ea2 Fixes morph spawn event bugs 2020-02-12 12:36:22 +10:00
Atermonera
6374108fa2 Applies same restrictions as first aid to external synth repair 2020-02-10 18:53:31 -05:00
Atermonera
571fe9f734 Merge pull request #6667 from Heroman3003/voidsuti-surgery 
Prevents surgery from being done while wearing a voidsuit
 2020-02-10 16:03:04 -05:00
Novacat
7933afeab7 Merge pull request #6511 from Heroman3003/superpod 
Limits the locations at which drone pod can drop
 2020-02-10 11:05:26 -05:00
Novacat
4cf3bd94be Merge pull request #6439 from lbnesquik/Kath-Nif-Tweak 
Disable random blackouts during NIF adaptation
 2020-02-10 10:49:54 -05:00
Heroman3003
6a75d126b2 Merge branch 'master' into superpod 2020-02-10 23:08:57 +10:00
Heroman3003
0d21e91b68 Merge branch 'master' into belt-mining 2020-02-10 22:47:42 +10:00
Spades
ddc544205d Merge pull request #6429 from Heroman3003/morphevent 
Adds Morph Spawn event
 2020-02-10 07:21:57 -05:00
Novacat
6130b3f9cb Merge pull request #6552 from Heroman3003/dusthide 
Removes magic dust from random reagents accessible via randomized seeds
 2020-02-10 01:13:46 -05:00
Heroman
ead75dbace Switches comments back to block edit 2020-02-10 15:52:29 +10:00
Novacat
33c13b4a28 Merge pull request #6551 from Heroman3003/pizza-un-nerf 
Undoes unnecesary nerfs on pizzas
 2020-02-10 00:48:02 -05:00
Heroman
d841259cf3 Adds logging to the breaking of devourable/feeding prefs 2020-02-10 13:43:35 +10:00
Heroman
8822a40adf adjust comments 2020-02-10 13:06:43 +10:00
Heroman
3e5d2abb43 Removes magic dust from random reagents accessible via randomized seeds 2020-02-10 12:53:15 +10:00
Heroman
292a403d6a Undoes unnecesary nerfs on pizzas 2020-02-10 10:01:02 +10:00
Novacat
7a704616ea Merge pull request #6544 from VOREStation/upstream-merge-6665 
[MIRROR] 2020 Civilian Wing Overhaul
 2020-02-08 16:44:36 -05:00
Novacat
d91c8ec074 Merge pull request #6546 from VOREStation/upstream-merge-6677 
[MIRROR] ATMs can now be emagged
 2020-02-08 15:56:58 -05:00
Atermonera
db173390d7 Merge pull request #6677 from Schnayy/atmfix 
ATMs can now be emagged
 2020-02-08 14:03:43 -05:00
Atermonera
81530b8c21 Merge pull request #6673 from Cerebulon/refixskirts 
Fixes Jumpskirt Sprites
 2020-02-08 14:02:30 -05:00
Atermonera
c9e3257d17 2020 Civilian Wing Overhaul 2020-02-08 13:56:05 -05:00
Novacat
00a2acb48f Merge pull request #6541 from Heroman3003/quantum-pad-limit 
Caps upgrading on quantum pad
 2020-02-07 17:35:03 -05:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
Heroman
2764db5f4d Caps upgrading on quantum pad 2020-02-08 06:46:27 +10:00
Leshana
fffd922cde Fix character setup preview icons rendering prior to SSAtoms initialization 
- Rendering the characters involved creating mannequin mobs, prior to SSAtoms init these would not be initialized and thus have no DNA.  This prints many warning messages, causes runtimes, and ultimately the icon does not render correctly.
- Its fixed here since it seems that needing to use mobs prior to initialization is a pretty unique edge case.  Comment added to explain to future us.
 2020-02-04 16:33:22 -05:00
Leshana
b7da221856 Fixes Runtime in living_vr.dm,428: Cannot read null.name 
This was happening when null is passed for belly. Now it will print *null*
Also fixed root cause (at least one of them).
Animals can't have vore attributes enabled when vore_active = 0 because
then they don't get a belly.
 2020-02-04 16:33:22 -05:00
Atermonera
af6992e09a Merge pull request #6669 from Mechoid/FixSuitIconIssue 
Fix issues introduced by the world server icon system port.
 2020-02-04 15:51:20 -05:00
Novacat
f1394460c2 Merge pull request #6514 from VOREStation/upstream-merge-6651 
[MIRROR] Ports Clothing Expansion Code from World Server
 2020-02-04 11:21:37 -05:00
Atermonera
1f227a9b55 Merge pull request #6664 from PrismaticGynoid/loadouttoys 
Adds some toys to the loadout
 2020-02-03 20:50:45 -05:00
Novacat
bc9f1d4a5e Merge pull request #6522 from VOREStation/iprlogs 
Additional VPN/Proxy/Tor checking
 2020-02-01 23:37:14 -05:00
Novacat
c12e324270 Merge pull request #6528 from VOREStation/upstream-merge-6658 
[MIRROR] Teshari Poncho Fix
 2020-02-01 18:38:01 -05:00
Atermonera
66b7793d25 Merge pull request #6661 from LeighKnapenberger/patch-1 
Fixes killer tomato mutation
 2020-02-01 18:08:47 -05:00
Atermonera
00f301d802 Merge pull request #6658 from Darlantanis/TeshariPonchoFix 
Teshari Poncho Fix
 2020-02-01 18:01:12 -05:00
Killian
052380be50 updates & fixes 2020-02-01 13:55:40 +00:00
Cerebulon
e0258e1449 Fixes antibiotic resistance being reset when copied to new datum instance (#6654) 2020-01-31 23:46:54 -05:00
Heroman
778544fe67 Makes syndie beacon found in xenoarch use virgo-specific subtype 2020-02-01 09:55:47 +10:00
Arokha Sieyes
2b01382eed Needs to return true 2020-01-31 15:11:33 -05:00