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

23734 Commits

Author SHA1 Message Date
Heroman
3e5d2abb43 Removes magic dust from random reagents accessible via randomized seeds 2020-02-10 12:53:15 +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
Arokha Sieyes
2b01382eed Needs to return true 2020-01-31 15:11:33 -05:00
Arokha Sieyes
aa528264dd Add some vorestation-specific IPR things 2020-01-31 14:53:52 -05:00
Atermonera
1bc3ccf858 Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no 
Hacky Fix for Athletic Shorts showing Missing Icon
 2020-01-30 19:24:59 -05:00
Novacat
7a9f31a26a Merge pull request #6515 from TheFurryFeline/patch-18 
Redundant Warning Removed
 2020-01-30 02:09:59 -05:00
Novacat
923855a5d1 Update update_icons.dm 2020-01-30 02:03:56 -05:00
Novacat
69b1cbf995 Update update_icons.dm 2020-01-30 02:00:31 -05:00
Novacat
eb467280e8 Update update_icons.dm 2020-01-30 01:58:34 -05:00
TheFurryFeline
301cae5994 Redundant Warning Removed 
Changelog Notes: 

- Removes the big, honking red text about archive being slated for removal. We're not removing entries from the database.
 2020-01-29 12:28:28 -05:00
Atermonera
130d942a2d Ports Clothing Expansion Code from World Server 2020-01-28 14:16:24 -05:00
Atermonera
16989eaa84 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix 
Fixes constant stacking machine runtimes
 2020-01-28 14:14:06 -05:00
Novacat
75b8b621f9 Merge pull request #6490 from Rykka-Stormheart/shep-dev-borghound-buffs 
Add additional tools for Research Hound and Pupdozer - Upstream Port
 2020-01-26 16:38:37 -05:00
Novacat
f522a88378 Merge pull request #6489 from Rykka-Stormheart/shep-dev-pupdozer-model 
Add Citadel RP Alternative Pupdozer + Additional Tools - Upstream Port
 2020-01-26 16:38:25 -05:00
Novacat
4505684fbd Merge pull request #6507 from VOREStation/upstream-merge-6603 
[MIRROR] Add an audible alarm sound to SM Delamination
 2020-01-25 23:04:14 -05:00
Novacat
c44268a96d Merge pull request #6506 from VOREStation/upstream-merge-6649 
[MIRROR] Fixes Bagel Poppy Recipe
 2020-01-25 22:56:34 -05:00
Novacat
2366e865f3 Update supermatter.dm 2020-01-25 22:56:18 -05:00
Atermonera
d5869f2c3f Add an audible alarm sound to SM Delamination 2020-01-25 22:25:49 -05:00
Atermonera
4e523c9b5e Merge pull request #6649 from Trexdude/patch-1 
Fixes Bagel Poppy Recipe
 2020-01-25 22:16:18 -05:00
Atermonera
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
TheFurryFeline
0b10c316cc Aaa 
Typo fix to comment, ree.
 2020-01-24 11:17:30 -05:00
TheFurryFeline
41ce1ae13f No More Vines That Shrink Thee 
Changelog Notes: 

- Blacklist Macro/micro/normal cillins from list of spawnable chems in vines that can get injected into your body. This is purely for pref reasons if you don't actually like having your size changed.
 2020-01-24 10:26:11 -05:00
Novacat
4d2ec30fb9 Merge pull request #6499 from VOREStation/upstream-merge-6645 
[MIRROR] Adds book cart to library
 2020-01-24 00:55:57 -05:00
Novacat
44bad05eed Merge pull request #6501 from VOREStation/upstream-merge-6639 
[MIRROR] Preset (mapped-in) modular computers now have printers by default.
 2020-01-24 00:54:22 -05:00
Atermonera
ac208d171d Preset (mapped-in) modular computers now have printers by default. (#6639) 2020-01-23 23:55:51 -05:00
Schnayy
8ebe8c8772 Adds book cart to library 2020-01-23 23:53:25 -05:00
Schnayy
98d0b5a2bc Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 23:52:12 -05:00
Novacat
2914cbf2ce Merge pull request #6497 from VOREStation/upstream-merge-6648 
[MIRROR] Fix Water Resistance.
 2020-01-23 17:40:31 -05:00
Novacat
37f2862660 Update species.dm 2020-01-23 17:14:31 -05:00
Atermonera
b2cafb7e14 Fix Water Resistance. 2020-01-23 17:13:51 -05:00
Heroman
824637d6a4 _vr 2020-01-24 08:13:45 +10:00
Heroman
d8c43701ff Removes prommies weakness to water entirely 2020-01-24 08:11:02 +10:00