cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,607 Commits 5 Branches 0 Tags
dd7a7842eda0f81eb0f67dc554eadf23bc9ef14e
Commit Graph

34888 Commits

Author SHA1 Message Date
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival 
Adds Prototype Hypospray
 2019-08-12 13:15:35 -04:00
Spades
de8be8f2dc Merge pull request #5578 from BlackMajor/Dumb-verb 
Adds an admin verb for spawning players as mobs with their vore prefs intact
 2019-08-12 09:41:01 -04:00
BlackMajor
419db94458 Adds requested changes yeet 2019-08-11 17:22:20 +12:00
BlackMajor
67885bca42 Oh wait that's important 2019-08-11 02:03:32 +12:00
BlackMajor
1035c6e8dd ew empty lines 2019-08-11 01:45:39 +12:00
BlackMajor
da7949b4b6 I should probably remove those debug messages 2019-08-11 01:38:57 +12:00
BlackMajor
0a2e805735 Adds spawn character as mob verb 2019-08-11 01:37:36 +12:00
Unknown
1cd0ee6daf Purges bad indentation 2019-08-10 04:06:08 -04:00
Unknown
0afd758767 Adds pilot qualification pin to loadout 
Currently only allows job roles with pilot access to take it.
 2019-08-10 04:01:51 -04:00
Novacat
46f76391ba Merge pull request #5573 from VOREStation/upstream-merge-6380 
[MIRROR] Allows Construction of Serenity in Robotics
 2019-08-08 19:12:54 -04:00
Novacat
75e53b8fc9 Update mechfab_designs.dm 2019-08-08 16:30:44 -04:00
Novacat
eced9eda28 Update circuits.dm 2019-08-08 16:30:08 -04:00
Novacat
c0f842b2d2 Merge pull request #5572 from VOREStation/upstream-merge-6387 
[MIRROR] Makes ahelping on existing ticket give proper feedback
 2019-08-08 16:29:17 -04:00
Andrew
9d93bea992 Allows Construction of Serenity in Robotics 2019-08-08 16:28:07 -04:00
Novacat
31924e23de Update materials.dm 2019-08-08 16:09:13 -04:00
Atermonera
1a15bb765d Merge pull request #6387 from Heroman3003/ahelp-feedback 
Makes ahelping on existing ticket give proper feedback
 2019-08-08 16:09:05 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Verkister
33bbcf5a5c Properly labels the vore tab custom species button 
The misleading label causing needless troubleshooting steps had been bothering me for a good while already.
 2019-08-08 18:05:23 +03:00
Novacat
8e321b3725 Update hypospray.dm 2019-08-06 22:10:50 -04:00
Unknown
d7406088b5 Test 2019-08-06 21:07:40 -04:00
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