cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 18:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

5193 Commits

Author SHA1 Message Date
Neerti
627cdecf66 Subspace Jammer now blocks signalers, suit sensors, lasts longer 2019-03-04 22:58:41 -05:00
Unknown
85be5a9166 [5654] Resolves Merge Error 
"But I wanted to play Hearts of Iron..."
"NO."
 2019-03-01 23:58:05 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Neerti
6de658bf0d Merge pull request #5981 from Heroman3003/handtele-fix-fix 
Handtele no longer relies on teleporter being mapped in in very specific way
 2019-02-28 22:30:17 -05:00
Spades
71d1a05531 Merge pull request #4543 from VOREStation/upstream-merge-5747 
[MIRROR] Makes fulltile windows seperate from dir
 2019-02-25 08:57:19 -05:00
Unknown
a4317b1910 [5654] Makes this PR Compile 
This one made me cry.
 2019-02-23 12:30:16 -05:00
Poojawa
6f2548e47b Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735 2019-02-02 03:55:21 -06:00
Atermonera
439afee2ab Unclogs powersink drains 2019-01-26 17:54:34 -05:00
Hawk_v3
e42c386d7e Merge remote-tracking branch 'upstream/master' 2019-01-22 21:58:25 +00: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
Anewbe
3d557f93d0 Fixes candle sprites 2019-01-18 15:46:55 -05:00
Anewbe
8e9e83fde0 Merge pull request #5858 from Atermonera/suitcooler_pressurization 
Suit coolers don't overheat in vacuum
 2019-01-18 09:15:04 -05:00
Hawk_v3
2bc1f83de7 Merge remote-tracking branch 'upstream/master' 2019-01-15 20:56:39 +00:00
Anewbe
1ea5885504 Merge pull request #5825 from PolarisSS13/butt_boxing 
Adds ability to put butts in boxes
 2019-01-14 21:23:41 -05:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Neerti
e1cf31c565 Merge pull request #5835 from Cerebulon/ReligionUpdate 
Updates Religion Lists + Adds Religious Paraphernalia
 2019-01-14 03:47:00 -05:00
Neerti
58ca3dd469 Merge pull request #5824 from Heroman3003/paint_bucket_fix 
Fixes non-black/white paint buckets not actually having paint in them
 2019-01-12 04:23:21 -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
Atermonera
565ca393d8 Merge pull request #5779 from Novacat/spriteadd 
Emergency tanks start full
 2018-12-30 17:08:38 -05:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00: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
Hawk_v3
300d9086e2 Merge remote-tracking branch 'upstream/master' 2018-12-09 19:45:43 +00: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
Hawk_v3
f317802ada Merge remote-tracking branch 'upstream/master' 2018-12-07 00:57:12 +00:00
kevinz000
fc178c1e04 Makes math helpers defines for performance 2018-12-06 16:15:00 -05: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
Anewbe
2572f3a145 Merge pull request #5747 from Neerti/fulltile_window_improvements 
Makes fulltile windows seperate from dir
 2018-12-04 14:37:19 -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
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
Hawk_v3
30d6ee7801 Merge remote-tracking branch 'upstream/master' into updates 2018-11-01 23:15:58 +00:00
Neerti
0e3a60e10c Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak 
Biogenerator improvements.
 2018-10-30 18:40:18 -04:00
Unknown
6018fe8d23 Travis plz 2018-10-30 13:47:32 -04:00