cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,680 Commits 8 Branches 0 Tags
27565f4da99fed5a814593f647fb59b4375c7f93
Commit Graph

34412 Commits

Author SHA1 Message Date
Novacat
b13fadf424 Update otie.dm 2019-04-22 22:21:08 -04:00
Novacat
689b970f84 Update frog.dm 2019-04-22 22:20:38 -04:00
Novacat
5adb279757 Update dino.dm 2019-04-22 22:20:22 -04:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Heroman
bd6b93780d Merge branch 'master' into repositioning 2019-04-23 05:13:28 +10:00
Heroman
03510c6d1b Redesigns exploration, moves chapel and AI 2019-04-23 05:10:43 +10:00
Novacat
23200456b2 Merge pull request #5124 from VOREStation/upstream-merge-6114 
[MIRROR] Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:52:42 -04:00
Novacat
86bc934745 Merge pull request #5123 from VOREStation/upstream-merge-6117 
[MIRROR] Hides AI Shells from the manifest.
 2019-04-22 14:52:20 -04:00
Atermonera
6cb44efd10 Merge pull request #6114 from Neerti/gamemode_config 
Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:33:38 -04:00
Atermonera
9152030002 Merge pull request #6117 from Neerti/ai_shell_manifest_fix 
Hides AI Shells from the manifest.
 2019-04-22 14:31:22 -04:00
Atermonera
eff39e3366 Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev 
Marble ore [Exists] again.
 2019-04-22 14:30:03 -04:00
Unknown
08b26b9bd8 Overlooked mobs 2019-04-22 03:17:32 -04:00
Unknown
ee09299293 Halves damage from voremobs 
12:23 AM] Neerti: Did Virgo not halve the damage of their mobs when coverting to the new AI system?

WHOOPS!
 2019-04-22 03:12:00 -04:00
Novacat
6f67b1f902 Merge pull request #5120 from VOREStation/upstream-merge-6115 
[MIRROR] Sterilizine Hurts Slimes
 2019-04-22 01:35:26 -04:00
Novacat
207775b2a7 Merge pull request #5119 from VOREStation/upstream-merge-6124 
[MIRROR] Fixes message on window frame fastening
 2019-04-22 01:27:19 -04:00
Novacat
2d403d518d Merge pull request #5118 from VOREStation/upstream-merge-6125 
[MIRROR] Fixes ability to deconstruct fire alarms
 2019-04-22 01:27:05 -04:00
Novacat
85711f77dc Merge pull request #5117 from VOREStation/upstream-merge-6105 
[MIRROR] Fixes borgs being unable to use ladders
 2019-04-22 01:26:46 -04:00
Neerti
d9a7b5705c Merge pull request #6115 from Mechoid/SterilizineTheThinkingXenobiologistsWeapon 
Sterilizine Hurts Slimes
 2019-04-22 01:25:15 -04:00
Neerti
cbb56b0546 Merge pull request #6124 from Heroman3003/window-message-fix 
Fixes message on window frame fastening
 2019-04-22 00:29:26 -04:00
Neerti
7a66fc1854 Merge pull request #6125 from Heroman3003/fire-alarm-deconstruction 
Fixes ability to deconstruct fire alarms
 2019-04-22 00:29:16 -04:00
Neerti
9df9e135a6 Merge pull request #6105 from Heroman3003/climbybois 
Fixes borgs being unable to use ladders
 2019-04-22 00:28:01 -04:00
Neerti
2ffe390346 Merge pull request #6116 from Mechoid/WhyAmIStupid 
God damnit past me.
 2019-04-22 00:27:50 -04:00
Unknown
6dc8552e8c Finishes this PR 2019-04-21 21:32:39 -04:00
InterroLouis
7d63917579 Update loadout_accessories_vr.dm 2019-04-21 17:28:22 -04:00
Unknown
afc0d67f21 [WIP] Expedition Sub-department 
- Moves explorer job roles from their respective departments into an Exploration sub-department
- CHAIN OF COMMAND WILL REMAIN UNCHANGED
- ACCESS WILL REMAIN UNCHANGED
Note: Pathfinder's minimum access is getting tweaked, in case minimum access ever gets used.

This is a purely clerical change that is being done for two reasons.
1: To enable off duty exploration role, important for the upcoming timeclock PR. The upcoming timeclock functionality will cause difficulties for expedition roles, due to, at present, being in a wide variety of different departments.
2: Generally, explorer roles in other departments tended to create confusion, as people would ask (or even demand) those roles to do station-side duties, even if their access (or lack thereof) made it impossible.
 2019-04-21 17:05:58 -04:00
Heroman
fef914b3bd Adds KA holster to mining vendor 2019-04-22 06:47:55 +10:00
InterroLouis
4fe127b83a Update loadout_accessories_vr.dm 2019-04-21 15:47:01 -04:00
Novacat
ff8f22ad94 Merge pull request #5108 from VOREStation/upstream-merge-6107 
[MIRROR] Adds Config-Controlled Automated Solar Setup
 2019-04-21 11:45:37 -04:00
Novacat
982db3fb50 Merge pull request #5109 from Heroman3003/hewwo-give-mask-back 
Fixes gasmasks on human sprites appearing wrong
 2019-04-21 11:45:15 -04:00
Heroman
41f726ee8f Fixes gasmasks on human sprites appearing wrong 2019-04-21 17:55:28 +10:00
Neerti
40e5fda9ca Adds Config-Controlled Automated Solar Setup (#6107) 
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
 2019-04-21 03:34:25 -04:00
Heroman
727ecd39a8 Removes glucose autoinjectors from vendomats 2019-04-21 16:06:49 +10:00
Heroman
b077e747f2 more commenting 2019-04-21 15:16:26 +10:00
Heroman
ebe96f79b2 Reenables solargrub files 2019-04-21 11:42:14 +10:00
Atermonera
6dc9f9a946 Merge pull request #6102 from Heroman3003/taping-it-all-up 
Fixes taperolls not being usable on tiles with directional windows
 2019-04-20 20:28:00 -04:00
Neerti
90e2d35db0 Merge pull request #6112 from Heroman3003/unredundanting 
Removes redundant fix for a bug that never existed
 2019-04-20 13:55:08 -04:00
Neerti
1cb351e0bf Merge pull request #6119 from Heroman3003/sticky-substance 
Fixes nurse spiders getting stuck in infinite loop
 2019-04-20 04:22:28 -04:00
Heroman3003
33b1d7b5a8 Fixes potential exploit nobody would know about 2019-04-19 12:58:30 +10:00
Heroman3003
1a9cdecb32 Finishes timeclock duty switching functionality 2019-04-19 10:28:38 +10:00
Novacat
17eadd4444 Merge pull request #5069 from Sebbe9123/mobpathfix 
Hopefully fixes all paths here and there
 2019-04-18 18:50:33 -04:00
Sebbe
9f5e176cd0 unedits thing as requested 2019-04-18 23:54:56 +02:00
Heroman
5f494a8470 Implements ability to move On-Duty 2019-04-19 07:50:53 +10:00
Unknown
a5df38c370 Tether Wilderness Adjustments 
- Adds Geese (and Gaslamps)
- Adjusts mob spawns on some POIs
- Adds Air canisters to structures with primitive airlocks
 2019-04-18 17:35:54 -04:00
Heroman
364766fae4 Adds generation of onduty jobs for timeclock 2019-04-19 05:11:56 +10:00
Novacat
49e8fa5487 Merge pull request #5096 from VOREStation/upstream-merge-6096 
[MIRROR] Changes way syringes interact with containers
 2019-04-18 14:02:51 -04:00
Novacat
94b7ef33bb Merge pull request #5098 from VOREStation/upstream-merge-6109 
[MIRROR] Makes transfer always occur if nobody is playing.
 2019-04-18 14:00:45 -04:00
Novacat
aac3f800ba Update syringes.dm 2019-04-18 13:53:34 -04:00
Novacat
8e93b70bb6 Update syringes.dm 2019-04-18 13:51:08 -04:00
Novacat
358b7023f2 Merge pull request #5097 from VOREStation/upstream-merge-6099 
[MIRROR] Fixes fortune cookie recipe runtime
 2019-04-18 13:48:13 -04:00
Novacat
557a36e2e5 Conflict Resolution 2019-04-18 13:47:28 -04:00