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
46,680 Commits 5 Branches 0 Tags
27565f4da99fed5a814593f647fb59b4375c7f93
Commit Graph

22558 Commits

Author SHA1 Message Date
Novacat
18c63cfab6 Merge pull request #5100 from Novacat/nova-survival 
Tether Wilderness Adjustments
 2019-04-25 21:10:46 -04:00
Unknown
62295136f3 Changes Engineering to LHS 2019-04-25 20:09:09 -04:00
Unknown
729b1fc662 Changes off Duty ID Aesthetics 2019-04-25 19:56:47 -04:00
Heroman3003
c7a56ff982 Initial commit 2019-04-26 08:39:07 +10:00
Novacat
a2507d900d Merge pull request #5139 from VOREStation/upstream-merge-6131 
[MIRROR] Fixes a typo in nurse spider ai code
 2019-04-25 17:12:39 -04:00
Neerti
ad51d60531 Merge pull request #6131 from Heroman3003/nurse-two 
Fixes a typo in nurse spider ai code
 2019-04-25 17:02:30 -04:00
Neerti
d3be46f669 Merge pull request #6132 from Heroman3003/fix-ai-target-priority 
Fixes ai priority targeting
 2019-04-25 17:01:13 -04:00
Heroman3003
3e33e7c1fc Removes window tint button from possible targets (due to bugs) 2019-04-25 12:44:21 +10:00
Heroman3003
77d6c43231 Adds placeholder cataloguer entry 2019-04-25 12:34:17 +10:00
Heroman3003
6d543572dd Merge branch 'master' into solargrubs-return-bring-the-hate-in 2019-04-25 12:25:15 +10:00
Heroman3003
1b23826267 Fixes Solargrubs. 2019-04-25 12:21:44 +10:00
Unknown
a646af0c4c Stops infinite loop 2019-04-24 20:53:32 -04:00
Unknown
4f70cf5865 I did a stupid 2019-04-24 20:26:12 -04:00
Unknown
f21c5e4430 Adds Subtle Teleporter 
It is also a structure, which should make it easier to use in buildmode. Current uses vanilla portal sprite.
 2019-04-24 20:20:51 -04:00
Anewbe
b01c0bb40c Merge pull request #6126 from Heroman3003/phoronguard 
Fixes some items having item_flag PHORONGUARD
 2019-04-24 17:13:17 -04:00
Novacat
3d4333a405 Merge pull request #5132 from Novacat/nova-aifixes 
Adds hostile NPC shadekin
 2019-04-24 16:36:38 -04:00
Novacat
69d2d01c02 Conflict Resolution 2019-04-24 15:36:07 -04:00
Atermonera
44fd128ec5 Xenobio Slimes Grudge Promethean Attackers 2019-04-24 15:30:43 -04:00
Unknown
57f92df2ea Adds hostile NPC shadekin 
By staff request.
 2019-04-24 13:00:33 -04:00
Novacat
6ad6879574 Merge pull request #5130 from Heroman3003/a-kin-fixing 
Fixes shadekin feeling the burn
 2019-04-24 11:50:43 -04:00
Novacat
37ede97410 Merge pull request #5131 from Heroman3003/micromaking 
Fixes gripper being unable to hold micromech parts
 2019-04-24 11:50:29 -04:00
Heroman
7c3181e599 Fixes gripper being unable to hold micromech parts 2019-04-24 20:53:17 +10:00
Heroman
5a93f11054 Fixes shadekin feeling the burn 2019-04-24 19:36:45 +10:00
Heroman
4d5b72d4c5 Mostly fixes grubs 2019-04-24 17:41:55 +10:00
Novacat
cd022ca990 Merge pull request #5113 from Heroman3003/ka-holsters 
Adds KA holster to mining vendor
 2019-04-24 01:27:58 -04:00
Heroman3003
f408c25f29 Continuing 2019-04-24 10:20:34 +10:00
Heroman
f6d7f963d3 Temp 2019-04-24 05:19:47 +10:00
Novacat
a28944dc48 Merge pull request #5126 from Heroman3003/placeholder-galore 
Cataloguer placeholders
 2019-04-22 23:20:09 -04:00
Novacat
d252f8d857 Merge pull request #5121 from Novacat/nova-aifixes 
Halves damage from voremobs
 2019-04-22 23:19:43 -04:00
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
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
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
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