cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,576 Commits 6 Branches 0 Tags
1fb88e40e21c0133a2a1388f26f6c9e7421bb202
Commit Graph

22871 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04: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
Novacat
077c4441d4 Merge pull request #5477 from Wickedtemp/master 
Allows Brute/Burn Healing Surgeries On Corpses
 2019-07-29 15:35:43 -04:00
Spades
2ab5a99089 Merge pull request #5517 from mistyLuminescence/spice 
Request Spice
 2019-07-29 15:15:11 -04:00
Spades
85f2f6d16e Merge pull request #5475 from Sebbe9123/Awoospeak 
Adds cursed speak autohiss
 2019-07-29 15:09:37 -04:00
Heroman
64ee0d757a Fixes default teshari tails not matching color of body 2019-07-29 09:24:10 +10:00
Novacat
179a4b4127 Merge pull request #5496 from Mewchild/MC-DarkBar 
Adds the Dark Bar to the Tether
 2019-07-28 14:19:48 -04:00
Anewbe
ffeb6ba7eb Merge pull request #6349 from MagmaRam/b52fix 
Fixes the metamorphic glass sprite for the B-52
 2019-07-28 14:00:16 -04:00
Novacat
50136a254c Merge pull request #5510 from VOREStation/upstream-merge-6303 
[MIRROR] Combat Mechs Can Punch More Things
 2019-07-27 17:40:22 -04:00
Heroman
efb81f45fc Fixes merge errors 2019-07-28 07:08:18 +10:00
Heroman
0bc5d5b3ba Replaces Termination with Demotions as default rank removal 2019-07-28 06:46:05 +10:00
Novacat
8f00834eb8 Merge pull request #5526 from VOREStation/upstream-merge-6324 
[MIRROR] Adds Laser Tag Turrets Plus Changes
 2019-07-27 16:26:30 -04:00
Novacat
83a2cb7490 Merge pull request #5525 from VOREStation/upstream-merge-6331 
[MIRROR] Makes Husking Require More Burn
 2019-07-27 16:24:49 -04:00
Novacat
fad621705a Merge pull request #5524 from VOREStation/upstream-merge-6334 
[MIRROR] New Clothing & Sweaters
 2019-07-27 16:24:32 -04:00
Novacat
9b0c54b513 Merge pull request #5520 from VOREStation/upstream-merge-6325 
[MIRROR] Fixes Repairing Bots
 2019-07-27 16:23:08 -04:00
Novacat
79eb2e57a5 Merge pull request #5519 from VOREStation/upstream-merge-6347 
[MIRROR] Cyborgs Can See and Repair Holes in Ceiling
 2019-07-27 16:22:49 -04:00
Andrew
69ed422019 Adds Laser Tag Turrets Plus Changes (#6324) 
* Adds Laser Tag Turrets

* Adds changelog

* Reverts Lethal Turrets Shooting to Kill

* Small No Longer Means Misc Life

* Revert "Merge branch 'master' into Turret"

This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.

* Revert "Revert "Merge branch 'master' into Turret""

This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.

* Github why

* Change laser.dm to master?

* Revert "Change laser.dm to master?"

This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
 2019-07-27 15:45:58 -04:00
Atermonera
d464d5560d Merge pull request #6331 from Nalarac/patch-4 
Makes Husking Require More Burn
 2019-07-27 15:10:26 -04:00
Atermonera
de27063ae1 Merge pull request #6334 from Schnayy/clothingpack1 
New Clothing & Sweaters
 2019-07-27 15:09:11 -04:00
if there were two guys on the moon
e51356209e 10 min CD 2019-07-27 19:21:21 +01:00