cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-27 17:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,289 Commits 8 Branches 0 Tags
190ead1dfd8d3692ee431a2abfffe6026bdb8867
Commit Graph

7730 Commits

Author SHA1 Message Date
Sebbe9123
420803122b re-fixes this file since it wasn't obvious I was a brainlet before. 2019-02-20 23:50:07 +01:00
Sebbe9123
d329ad5fe8 Re-adds mouse because someone lazy comment. 2019-02-18 10:55:57 +01:00
Sebbe9123
b6b4980ea8 Fixes largecrates for real, i'm a fucking brainlet. 2019-02-18 10:46:07 +01:00
Sebbe9123
c0e0afe919 Fixes most crates in largecrave_vr. Oties still broke. 2019-02-18 10:25:28 +01:00
Sebbe9123
bd89126955 Fixes random_vr except oties 2019-02-18 09:08:36 +01:00
Sebbe9123
5b163c44a8 Updates Mob_spawner_vr to new paths. 
All the old paths have updated new ones besides the broken Otie.
 2019-02-18 08:50:53 +01:00
Poojawa
8d178972a1 ports #4581 Startup Runtime fix 2019-02-02 06:03:40 -06:00
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00
Spades
30ab44613d Merge pull request #4540 from VOREStation/upstream-merge-5714 
[MIRROR] Borg, Gripper, and Integrated Circuit interaction update.
 2019-01-21 11:42:38 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Spades
1b6f074890 Merge pull request #4622 from Novacat/nova-pathfinder 
Adds an Admin Subspace Jammer for events
 2019-01-05 00:04:57 -05:00
Spades
8c1b8aacb2 Merge pull request #4550 from Zap-zapper/size-im 
Size control implant
 2019-01-04 23:59:17 -05:00
Unknown
05b876aa3a Adds an Admin Subspace Jammer for events 
I plan on doing a stationary version down the road but that will require a lot more work.
 2018-12-31 09:13:39 -05:00
Spades
98e542144b Merge pull request #4524 from VOREStation/upstream-merge-5715 
[MIRROR] Updates Rapid Service Fabricators.
 2018-12-12 21:25:02 -05:00
Spades
e956afedbf Merge pull request #4529 from VOREStation/upstream-merge-5649 
[MIRROR] ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-12 21:24:38 -05:00
Spades
8c3c8c45c9 Merge pull request #4549 from Verkister/implantshuds 
Fixes some implant related issues.
 2018-12-12 21:19:41 -05:00
Zap-zapper
e7ae902098 Moving code from normal files to lewd files 2018-12-09 09:47:07 +07:00
Spades
9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes 
Expedition Job and Gear tweaks
 2018-12-08 09:44:15 -05:00
Spades
8518897faa Merge pull request #4461 from Novacat/nova-heterochromia 
Adds Subspace Radio
 2018-12-08 09:43:34 -05:00
Zap-zapper
3b2258ce38 size control implant 2018-12-08 17:12:33 +07:00
Verkister
c1536879b2 Fixes some implant related issues. 
-Fixes reagent implants being utterly bricked.
-Fixes backup implants not showing up in AR huds.
-Both issues were caused by implants now going way deeper into the bodyparts than before.
 2018-12-05 17:47:19 +02:00
Spades
e9b0432420 Merge pull request #4506 from Novacat/nova-survival 
Adds Prybars to Survival Boxes
 2018-12-04 20:21:05 -05:00
Atermonera
0a77d0d70d Borg, Gripper, and Integrated Circuit interaction update. 2018-12-03 20:22:47 -05:00
Atermonera
034c3e6615 Merge pull request #5649 from lbnesquik/Kates-Flashlight-F 
ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-01 00:33:49 -05:00
Atermonera
723a8081a0 Merge pull request #5715 from Mechoid/Service_Fab_Updoot 
Updates Rapid Service Fabricators.
 2018-12-01 00:17:23 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Spades
572363c628 Merge pull request #4443 from Novacat/nova-ert 
Splits first aid kit spawning
 2018-11-26 09:01:25 -05:00
Unknown
66c81bd521 More fixes 2018-11-25 15:20:49 -05:00
Unknown
3e741038db Not a child of crowbar, so code was not redundant 2018-11-25 12:22:30 -05:00
Spades
cdbaef570f Deleted redundant code, added placeholder code 2018-11-25 10:10:07 -05:00
Unknown
191d294067 I like even numbers better 2018-11-25 00:44:58 -05:00
Unknown
8fbd5a5d0a Adds Door Pry, to Ace's specifications 2018-11-24 16:23:17 -05:00
Unknown
797b9fa6e7 More Access Fixes 2018-11-24 15:10:29 -05:00
Unknown
3969e2ab09 Tightens up radio access a bit 2018-11-18 15:16:26 -05:00
Unknown
26f0741a6f Adds Crowbars to Survival Boxes 
Fixes #4505
 2018-11-18 02:45:41 -05:00
Aronai Sieyes
00c3e88542 Merge pull request #4469 from VOREStation/upstream-merge-5662 
[MIRROR] Biogenerator improvements.
 2018-10-31 23:59:20 -04:00
Neerti
0e3a60e10c Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak 
Biogenerator improvements.
 2018-10-30 18:40:18 -04:00
Neerti
68d1d5cce9 Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature 
Remplace the plant clippers with a pair hedgetrimmers
 2018-10-30 18:37:45 -04:00
Unknown
6018fe8d23 Travis plz 2018-10-30 13:47:32 -04:00
Unknown
9d382a8df5 Minor changes 2018-10-30 11:33:12 -04:00
Unknown
fd8d32896e Remove Srcs (Thanks Aro) 2018-10-30 11:28:55 -04:00
Unknown
ee756cfb29 Default Internal Channels Update 2018-10-30 10:31:24 -04:00
Unknown
bf63a5152e Requested Changes 1 2018-10-30 02:36:20 -04:00
Unknown
84358c4fd0 Adds Subspace Radio 
Pathfinder special equipment, currently spawns in the Pathfinder's locker.

It is a backpack radio that functionally works similar to a defibrillator, that can send and receive messages from anywhere regardless of telecoms. Is still susceptible to the usual methods of signal disruption such as jamming.
 2018-10-28 19:38:05 -04:00
Unknown
2833407b01 Custom PDAs for all roles 
Also fixes the issue of explorers getting cargo cartridges 4noraisin.
 2018-10-26 18:04:16 -04:00
Unknown
7324e5f1dc Splits first aid kit spawning 
Removes the override on first aid kit spawning preventing combat kits from being spawned, but adds a new 'Tetheraid' first aid kit spawn to prevent combat kits from spawning on the Tether, but allows them for expedition sites which still use random spawns.

Also changes the obj/random/maintenance randomly generated item to also only spawn 'Tetheraid' first aid kits, since it shows up twice on the Tether.

TL;DR, it splits first aid kit spawns into one for use on the Tether, which do not have a combat first aid kit, and one used outside the tether (such as POIs) which do have the possibility of spawning a combat first aid kit.
 2018-10-21 20:49:25 -04:00
Spades
b28213c906 Merge pull request #4356 from Novacat/nova-ert 
ERT Equipment Redo
 2018-10-20 17:34:41 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor 
Replaces awoo with wolfgirl
 2018-10-20 08:56:14 -04:00