cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,770 Commits 7 Branches 0 Tags
6f48c013823e618d245bf918b7fc438106e1d13a
Commit Graph

33168 Commits

Author SHA1 Message Date
Spades
6f48c01382 Merge pull request #4333 from kcin2001/fixes 
fixes copy paste error
 2018-10-12 06:00:28 -04:00
Aronai Sieyes
f9159296f9 Merge pull request #4358 from VOREStation/aro-traitstats 
Log trait and species usage for metrics
 2018-10-12 01:45:54 -04:00
Aronai Sieyes
1faaecb320 Merge pull request #4346 from VOREStation/upstream-merge-5632 
[MIRROR] Remplace sprite hammer with pickaxe
 2018-10-12 01:12:44 -04:00
Aronai Sieyes
a84074572a Merge pull request #4338 from Screemonster/shadefluffers 
Minor shadekin fixes
 2018-10-11 23:52:18 -04:00
Aronai Sieyes
a5afd37e18 Merge pull request #4318 from lbnesquik/Kates-Nevrean-Fix 
Adds nevrean eggs.
 2018-10-11 23:15:12 -04:00
Aronai Sieyes
1ece0b15a8 Merge pull request #4299 from ArgobargSoup/master 
Bug abdomens
 2018-10-11 21:42:54 -04:00
Arokha Sieyes
ea0d6fc5a1 Log trait and species usage for metrics 
Just some stuff for use in building statistics about characters
 2018-10-11 20:49:33 -04:00
Aronai Sieyes
79d590140e Merge pull request #4347 from VOREStation/upstream-merge-5617 
[MIRROR] Admin ticket system (for real this time)
 2018-10-10 21:22:59 -04:00
Arokha Sieyes
164c72267c Vorestation specific tweaks for tickets 2018-10-10 18:17:13 -04:00
Aronai Sieyes
ed525cef2c Merge pull request #4355 from VOREStation/upstream-merge-5650 
[MIRROR] Fix incorrect HUD/screen/hologram
 2018-10-10 17:40:57 -04:00
Aronai Sieyes
09035a8742 Merge pull request #4353 from VOREStation/upstream-merge-5646 
[MIRROR] Remove intensity from chemistry machines.
 2018-10-10 17:40:26 -04:00
Aronai Sieyes
52a993541a Merge pull request #4348 from VOREStation/upstream-merge-5641 
[MIRROR] Fixes several typos with oxygen_pump.dm.
 2018-10-10 17:40:09 -04:00
Aronai Sieyes
ea6867363b Merge pull request #4343 from VOREStation/upstream-merge-5640 
[MIRROR] Fixes laptop blocking grown adults.
 2018-10-10 17:27:24 -04:00
Anewbe
dc781b806d Merge pull request #5650 from lbnesquik/Kates-Why-Do-I-Have-To-Fix-This 
Fix incorrect HUD/screen/hologram
 2018-10-10 16:54:53 -04:00
Anewbe
726f01e15e Merge pull request #5646 from lbnesquik/Kates-Tiny-Tweak 
Remove intensity from chemistry machines.
 2018-10-10 16:54:30 -04:00
Spades
12b0f7fdff Merge pull request #4342 from VOREStation/upstream-merge-5635 
[MIRROR] Fix yes emote not working correctly.
 2018-10-10 05:27:04 -04:00
Spades
ae8b60f0d8 Merge pull request #4341 from VOREStation/upstream-merge-5634 
[MIRROR] Remove kobold.dm
 2018-10-10 05:26:42 -04:00
Spades
5b91c8fccd Merge pull request #4339 from Screemonster/idontgetsickigivesick 
Xenochimera virus tweak
 2018-10-09 17:07:36 -04:00
Spades
6988bfcc44 Merge pull request #4329 from VOREStation/upstream-merge-5638 
[MIRROR] Fixes chem master dumping reagents.
 2018-10-09 17:06:11 -04:00
Anewbe
e362c66f51 Merge pull request #5641 from avabee/patch-3 
Fixes several typos with oxygen_pump.dm.
 2018-10-09 16:36:23 -04:00
Anewbe
e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
Anewbe
f0db332943 Remplace sprite hammer with pickaxe 2018-10-09 16:28:45 -04:00
Atermonera
3943ef3dba Merge pull request #5640 from lbnesquik/Kates-Laptop-Fix 
Fixes laptop blocking grown adults.
 2018-10-09 13:52:53 -04:00
Atermonera
6be6f9a957 Merge pull request #5635 from lbnesquik/Kates-Emote-Fix 
Fix yes emote not working correctly.
 2018-10-09 13:48:35 -04:00
Atermonera
6b6f811278 Merge pull request #5634 from lbnesquik/Kates-Kobold-Remov 
Remove kobold.dm
 2018-10-09 13:44:16 -04:00
Screemonster
e3356ed5fe Xenochimera tweak 2018-10-09 14:12:02 +01:00
Screemonster
71f5870b46 Minor shadekin fixes 2018-10-09 13:15:13 +01:00
Spades
ec3fb80f97 Merge pull request #4335 from Novacat/nova-heterochromia 
Rebalances VR Jumpsuits
 2018-10-08 20:48:13 -04:00
Spades
f6ce097810 Merge pull request #4325 from VOREStation/upstream-merge-5639 
[MIRROR] Fixed smes terminal construction requiring more cable than used.
 2018-10-08 20:43:38 -04:00
Spades
ea056f6b88 Merge pull request #4316 from VOREStation/upstream-merge-5628 
[MIRROR] Minor issues fix.
 2018-10-08 20:29:08 -04:00
Unknown
b237af9eab Rebalances VR Jumpsuits 
Virgo-specific jumpsuits (KHI and Star Trek) available in loadout are not supposed to have protection bonuses over the non-virgo ones.
 2018-10-08 17:41:07 -04:00
Arokha Sieyes
92eff67417 Alter gateway access on 2 jobs 
Add gateway access to pathfinder, exploring is their job
Removed from HoP (who can readd it to themselves in emergencies if they need it, otherwise during 'normal times' there's no reason they'd need it)

Justifcations for leaving it with other jobs:
HoS - gateway area is classified as a high-security area, and is an area on the station that has an attack surface from unknown things, so it makes sense they have access to defend it. HoS abusing the access for 'not defense of station' reasons, such as 'I'm going to lead my own expedition, fuck explorers', is ahelpable.
CD - literally has all station access, doesn't even have a specific list
RD - generally has a superset of all pathfinder access, and the physical gateway structure is their machine, pretty sure
 2018-10-08 15:33:48 -04:00
kcin2001
fb4fcf1e18 fixes copy paste error 2018-10-08 11:58:01 -07:00
Spades
ccc1fa30ec Merge pull request #4313 from Novacat/nova-pathfinder 
Expedition Balance Tweaks
 2018-10-07 18:00:00 -04:00
Spades
311e184fb0 Merge pull request #4311 from lbnesquik/Kates-Hippo-Mob 
Hippo mob + Simple mob sounds
 2018-10-07 17:59:07 -04:00
Spades
189b724c59 Merge pull request #4305 from lbnesquik/Kates-Observe 
Fix misleading alert.
 2018-10-07 17:58:46 -04:00
Spades
8a657ce011 Merge pull request #4177 from Verkister/slowitemgurgles 
Makes item digestion gradual and belly damage based.
 2018-10-07 17:58:02 -04:00
Spades
f379ea2df4 Update weldingtool.dm 2018-10-07 17:55:35 -04:00
Spades
b1b565c352 Update weldingtool.dm 2018-10-07 17:55:01 -04:00
Spades
91a67b6b37 Update weldingtool.dm 2018-10-07 17:54:35 -04:00
Anewbe
e1e5109c42 Merge pull request #5638 from lbnesquik/Kates-Chemistry-Fix 
Fixes chem master dumping reagents.
 2018-10-07 16:44:17 -04:00
Anewbe
9a4a01a8bb Merge pull request #5639 from Heroman3003/smes-fix 
Fixed smes terminal construction requiring more cable than used.
 2018-10-06 16:04:40 -04:00
Spades
8c2e0928fa Merge pull request #4130 from KasparoVy/fix-tesh-hide-again 
Fix Teshari Hiding Again
 2018-10-06 08:25:35 -04:00
Kates
820a4fbb29 Update global_lists_vr.dm 2018-10-06 12:55:52 +02:00
Kates
7995b54e29 Update global_lists_vr.dm 2018-10-06 12:54:10 +02:00
Kates
9b91fff7fc Update global_lists_vr.dm 2018-10-06 10:35:15 +02:00
lbnesquik
986dc248b0 Adds nevrean eggs. 2018-10-06 10:06:28 +02:00
Atermonera
fafd85957f Minor issues fix. 2018-10-06 01:17:19 -04:00
Kates
06f01d9e58 Update new_player.dm 2018-10-06 03:27:58 +02:00
Unknown
5d7a974679 Reverts Phaser Nerf 2018-10-05 16:56:16 -04:00