cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,579 Commits 5 Branches 0 Tags
b5824871ed6e1fea1335c5ab3d093b4ea7db7974
Commit Graph

34868 Commits

Author SHA1 Message Date
Unknown
b5824871ed Removes unnecessary check 2019-08-06 21:05:51 -04:00
Unknown
03976d3dd3 Moves var 2019-08-06 21:03:35 -04:00
Unknown
f699825119 Forgot a Var 2019-08-06 20:58:25 -04:00
Unknown
1fb88e40e2 Adds Prototype Hypospray 
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents

Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
 2019-08-06 20:54:14 -04:00
Novacat
aa9dc54303 Merge pull request #5565 from VOREStation/upstream-merge-6378 
[MIRROR] Lowers Bot Emag Chance from Ion Storm
 2019-08-06 15:43:02 -04:00
Novacat
4f13d0bb42 Update ion_storm.dm 2019-08-06 15:30:47 -04:00
Novacat
d4e53aa693 Merge pull request #5564 from VOREStation/upstream-merge-6362 
[MIRROR] Event Tweaks / Fixes
 2019-08-06 15:30:30 -04:00
Atermonera
bdd0b2aa82 Merge pull request #6377 from Heroman3003/synth-finity 
Fixes synth legs being broken causing feedback loop
 2019-08-06 15:01:51 -04:00
Atermonera
e0d157294e Lowers Bot Emag Chance from Ion Storm 2019-08-06 14:57:30 -04:00
Atermonera
7939362cea Merge pull request #6362 from Mechoid/EventTweaks 
Event Tweaks / Fixes
 2019-08-06 14:54:10 -04:00
Novacat
3e95af1265 Merge pull request #5562 from VOREStation/upstream-merge-6295 
[MIRROR] Adds an advanced TTS circuit, and sign-camera.
 2019-08-05 19:02:44 -04:00
Spades
70072ca29c Merge pull request #5561 from TheFurryFeline/TFF-Reminder_For_Suit_Sensors! 
Suit Sensors Selectable
 2019-08-05 18:56:01 -04:00
Atermonera
e60f0daf47 Merge pull request #6295 from Mechoid/TTS_And_Sign 
Adds an advanced TTS circuit, and sign-camera.
 2019-08-05 18:52:48 -04:00
TheFurryFeline
2877917f3a Suit Sensors Selectable 
Allows selection of suit sensor settings in VORE tab on Character Setup. Work credited to https://github.com/PolarisSS13/Polaris/pull/4354 Adjustments made as needed to account for outdated code as well as making use of preferences_vr at last.
 2019-08-05 17:49:49 -04:00
Atermonera
f863fa8f7f Merge pull request #6357 from Michiyamenotehifunana/HanalSprites 
Resprites Health Analyzers and Adds Scanning Animations
 2019-08-04 17:21:03 -04:00
Unknown
32d5efa915 Fixes Subtle Teleporter 
Fixes a problem with the subtle teleporter not working outside of station Z Levels.
 2019-08-04 13:46:38 -04:00
Wickedtemp
ad03224230 Removes A Few Alternate Tool Options For 2 Surgical Operations (#6312) 
* Update external_repair.dm

* Update neck.dm
 2019-08-04 04:17:40 -04:00
Novacat
25fbfb57d6 Merge pull request #5555 from VOREStation/upstream-merge-6366 
[MIRROR] Tweaks Security Bots
 2019-08-03 13:19:58 -04:00
Novacat
ac2f51ab2d Merge pull request #5554 from VOREStation/upstream-merge-6367 
[MIRROR] Fixes Medibots Targetting FBPs
 2019-08-03 13:19:17 -04:00
Anewbe
638579f26a Merge pull request #6366 from Nalarac/Bot2 
Tweaks Security Bots
 2019-08-03 13:05:55 -04:00
Anewbe
5563462171 Merge pull request #6367 from Nalarac/Bot3 
Fixes Medibots Targetting FBPs
 2019-08-03 13:04:43 -04:00
Anewbe
62774db0b3 Merge pull request #6361 from Nalarac/Helmet-Cameras 
Changes Space Helmet Cameras to a Verb
 2019-08-03 13:03:30 -04:00
Novacat
942b4d8caf Merge pull request #5548 from Screemonster/specieslinks 
Adds quick wiki links to species pages
 2019-08-03 08:44:35 -04:00
Novacat
20cefd6590 Merge pull request #5546 from Novacat/nova-basicfixes 
Mining/Explorer Tweaks
 2019-08-03 08:43:45 -04:00
Novacat
c2463fc02b Merge pull request #5528 from Heroman3003/demotion 
Replaces "Terminated" with "Dismissed" as default rank removal
 2019-08-03 08:41:50 -04:00
Heroman
a8e3b1e270 Replaces Terminated with Dismissed as default rank removal 2019-08-03 21:59:56 +10:00
Spades
f15c7cd16e Merge pull request #5514 from CameronWoof/medical-sprites 
Resprites Advanced Burn and Trauma Kits
 2019-08-03 07:51:27 -04:00
Spades
4ce97f4a6e Merge pull request #5478 from mistyLuminescence/defib 
Defib Scanners
 2019-08-03 07:51:14 -04:00
Heroman
e844f55f96 Fixes missing vorestation edits 2019-08-03 07:47:59 +10:00
Heroman
687fd0fc75 Allows players to select, customize and save whitelisted characters without whitelist 2019-08-03 06:59:00 +10:00
Novacat
75777c551e Merge pull request #5551 from VOREStation/upstream-merge-6359 
[MIRROR] Updates Supermatter Guide Book
 2019-08-02 14:27:21 -04:00
Anewbe
7977f50b1c Merge pull request #6359 from Nalarac/patch-5 
Updates Supermatter Guide Book
 2019-08-02 14:06:45 -04:00
Anewbe
341832b995 Merge pull request #6364 from Nalarac/Mecha2 
Fixes Ripley Speedboost Being Uncreatable
 2019-08-02 13:57:07 -04:00
Screemonster
1af24b1496 Adds quick wiki links to species pages 2019-08-02 12:49:08 +01:00
Unknown
fb61850896 Mining/Explorer Tweaks 
- ORM Vendor no longer provides phase pistols
- Steel Machete renamed to Plasteel Machete
- Industrial Hardsuit modules renamed to simply Hardsuit modules
- Adds some of the new mining stuff to the explorer vendor
- Fixes missing survivalfood flag from liquidprotein rations
 2019-08-01 16:25:58 -04:00
Novacat
d5b416f70b Merge pull request #5542 from VOREStation/upstream-merge-6328 
[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
 2019-07-31 02:10:06 -04:00
Novacat
dc9d475725 Update recharger.dm 2019-07-31 01:46:21 -04:00
Novacat
f03ec2fbe8 Update recharger.dm 2019-07-31 01:45:15 -04:00
Novacat
7b4701f1d8 Merge pull request #5543 from VOREStation/upstream-merge-6354 
[MIRROR] Adds proper miss chance for stabbing people in the eyes.
 2019-07-30 20:29:53 -04:00
Novacat
4ce2695ee0 Merge pull request #5541 from VOREStation/upstream-merge-6353 
[MIRROR] Adds shutoff valve monitor
 2019-07-30 20:22:26 -04:00
Atermonera
a175e70865 Merge pull request #6354 from MagmaRam/eyestabs 
Adds proper miss chance for stabbing people in the eyes.
 2019-07-30 20:19:46 -04:00
Atermonera
35e0eeec78 Makes Heavy-Duty Cell Chargers Constructable 2019-07-30 20:18:33 -04:00
Novacat
b79076a62e Merge pull request #5512 from VOREStation/upstream-merge-6344 
[MIRROR] Manifolds now obey the laws of pipes.
 2019-07-30 20:05:42 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Novacat
ad1b2f134d Merge branch 'master' into upstream-merge-6344 2019-07-30 19:52:24 -04:00
Novacat
8ff1fc535f Merge branch 'master' into upstream-merge-6339 2019-07-30 19:51:16 -04:00
Novacat
d844f233c4 Merge pull request #5508 from VOREStation/upstream-merge-6279 
[MIRROR] Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
 2019-07-30 19:50:02 -04:00
Heroman
54be18505b Removes the leaks and related mechanics 2019-07-31 09:25:07 +10:00
Verkister
70b24a930a fixes sleeperbellies not ejecting on deletion 
in the meantime, just avoid applying reset modules on borgos with occupants inside
 2019-07-30 17:43:27 +03:00
Heroman
fea0c9954d Adds missing //Vorestation Edit 2019-07-30 05:38:29 +10:00