cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,852 Commits 8 Branches 0 Tags
47ccc655db22af91f0214997d3b1e4d4f6dd9544
Commit Graph

36036 Commits

Author SHA1 Message Date
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05: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
d1dbefffc4 Merge pull request #6539 from Meghan-Rossi/bombtesttweak 
Makes explosive simulators give slightly more helpful results for ttvs
 2020-02-12 10:42:47 -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
Novacat
a60e5cae18 Merge pull request #6562 from VOREStation/upstream-merge-6687 
[MIRROR] Shutoff monitoring console remotely controls valves
 2020-02-12 10:41:28 -05:00
Atermonera
3961c4cdbf Shutoff monitoring console remotely controls valves (#6687) 2020-02-12 00:17:09 -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
Novacat
06b7651799 Update nanopaste.dm 2020-02-10 18:59:12 -05: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
12a412be47 Merge pull request #6519 from Heroman3003/beltminecrate 
QoL to supplypacks related to Belt Mining
 2020-02-10 11:06:20 -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
Atermonera
0bbc8109ae Merge pull request #6675 from GeneriedJenelle/patch-1 
Logs graffiti and crayon drawings: Non-Cursed PR
 2020-02-09 23:45:06 -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
Atermonera
7b20362aaf Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change 
Stunbatons will now only harmbaton on grab/harm intents
 2020-02-09 14:47:00 -05: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
Novacat
e9435567dd Merge pull request #6545 from VOREStation/upstream-merge-6673 
[MIRROR] Fixes Jumpskirt Sprites
 2020-02-08 15:56:43 -05:00
Novacat
22c0fd363f Update bed.dm 2020-02-08 15:56:26 -05:00
Meghan-Rossi
3935aa3e47 fix conflict causing compile error 2020-02-08 19:32:03 +00:00
Atermonera
637a51edd7 Merge pull request #6676 from Meghan-Rossi/machinefix 
Fix frame deconstruction bugs
 2020-02-08 14:03:53 -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
bd2b049c74 Merge pull request #6543 from Heroman3003/taurlocator 
Also applies taur riding teleport limitation to translocators
 2020-02-07 23:05:38 -05:00
Heroman
b8c07ae29b Also applies taur riding teleport limitation to translocators 2020-02-08 13:35:41 +10: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
Novacat
796104c2cd Merge pull request #6537 from VOREStation/sundry-fixes-feb 
Sundry Bugfixes - Feburary
 2020-02-05 11:48:31 -05:00
Meghan-Rossi
8def3fa74a Makes explosive simulators give slightly more helpful results for ttvs 
Explosive simulators results now include the initial contents of both tanks for tank transfer valve simulations.
 2020-02-05 11:10:28 +00:00
Arokha Sieyes
3c5cfa838d Update sleevemate warning message 2020-02-04 20:16:13 -05: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
Novacat
ebb9db01e0 Merge pull request #6535 from VOREStation/upstream-merge-6664 
[MIRROR] Adds some toys to the loadout
 2020-02-04 11:00:49 -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
Atermonera
67889b8f99 Merge pull request #6653 from zekesulastin/disable-stat-tracking 
Changes DBCore connection procs to check for config value SQL_ENABLED instead of ENABLE_STAT_TRACKING
 2020-02-03 20:49:32 -05:00