cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,131 Commits 5 Branches 0 Tags
73924632b7e24372f9f63f118fb5e67f0d2ada5c
Commit Graph

33410 Commits

Author SHA1 Message Date
Anewbe
73924632b7 Fixes laptops blocking people properly. 2018-12-13 23:20:44 -05:00
Unknown
b48efb138f More merge conflict fixes 
I think I got them all.
 2018-12-13 00:33:32 -05:00
Spades
99cc046512 Merge pull request #4580 from VOREStation/upstream-merge-5724 
[MIRROR] Added washing machine working sound
 2018-12-12 21:27:14 -05:00
Spades
38541e27f5 Merge pull request #4576 from VOREStation/upstream-merge-5767 
[MIRROR] Fixed a typo in Space Heater's cell removal message
 2018-12-12 21:27:02 -05:00
Spades
9075eb25de Merge pull request #4530 from VOREStation/upstream-merge-5643 
[MIRROR] Mech noises update.
 2018-12-12 21:25:46 -05:00
Spades
2d11272b7c Merge pull request #4528 from VOREStation/upstream-merge-5742 
[MIRROR] Changes Mech Diamond Drill Cooldown
 2018-12-12 21:25:37 -05:00
Spades
8ff334d67c Merge pull request #4526 from VOREStation/upstream-merge-5736 
[MIRROR] Fixes missing hollow point ammo for 9mm
 2018-12-12 21:25:22 -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
670e5e3765 Merge pull request #4523 from VOREStation/upstream-merge-5718 
[MIRROR] New hair + underwear
 2018-12-12 21:24:49 -05:00
Spades
e956afedbf Merge pull request #4529 from VOREStation/upstream-merge-5649 
[MIRROR] ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-12 21:24:38 -05:00
Spades
37932732ca Merge pull request #4575 from Screemonster/stopfuckingwiththepomdamnit 
makes the pompom uncontaminatable
 2018-12-12 21:24:11 -05:00
Spades
04c529dbad Merge pull request #4573 from Verkister/patch-28 
Fixes quitting pods not handling belly contents.
 2018-12-12 21:23:24 -05:00
Spades
56dbc1a224 Merge pull request #4572 from Novacat/nova-heterochromia 
Fixes a runtime with radio.dm
 2018-12-12 21:23:11 -05:00
Spades
531bd6a7eb Merge pull request #4562 from Verkister/patch-27 
Disables PDA contamination.
 2018-12-12 21:22:15 -05:00
Spades
8c3c8c45c9 Merge pull request #4549 from Verkister/implantshuds 
Fixes some implant related issues.
 2018-12-12 21:19:41 -05:00
Spades
d46b03c2ca Merge pull request #4542 from Verkister/yeehowlayer 
Fixes some layering issues on taur/borg riding.
 2018-12-12 21:18:52 -05:00
Spades
1111241d7d Merge pull request #4533 from Verkister/patch-26 
Fixes digestive analyzer missing sync button
 2018-12-12 21:14:53 -05:00
Atermonera
9bc49a2ca7 Merge pull request #5724 from Heroman3003/washingmachine-noise 
Added washing machine working sound
 2018-12-11 16:46:36 -05:00
Neerti
89b17cece1 Merge pull request #5767 from Heroman3003/typo-heater 
Fixed a typo in Space Heater's cell removal message
 2018-12-09 23:48:35 -05:00
Screemonster
10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Verkister
c59ee70fe5 Fixes quitting pods not handling belly contents. 
-Basically fixes the actually visible bug of ID-containing PDAs in bellies pooping their IDs on the floor when the pred leaves by cryo/tp/tram.
 2018-12-09 13:43:33 +02:00
Unknown
a98204aa31 Fixes a runtime with radio.dm 
Load ordering was causing the access datums for explorer and pilot access to be defined after radio.dm was loaded, which caused radio.dm to look for access datums that did not exist at the time.

This causes the explorer and pilot access datums to load much earlier, fixing the runtime.
 2018-12-09 01:55:46 -05:00
Spades
5fe51f64ad Merge pull request #4507 from Verkister/patch-25 
Fixes ingested organs giving way too much fat
 2018-12-08 21:14:38 -05: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
Spades
fe30b9a61d Merge pull request #4409 from Novacat/nova-pathfinder 
Shelter Capsule Content Tweaks
 2018-12-08 09:42:18 -05:00
Verkister
db0cfe8829 Disables PDA contamination. 
No more messaging list meta.
 2018-12-07 17:31:59 +02: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
4a27ffb35a Merge pull request #4515 from pontifexminimus2/dragor-HEYLOOKTHISMORONFORGOTHOWTODOSOURCETREEIBLAMEYOUARONAIFORMAKINGMEJUMPTHROUGHTHESEHOOPS 
Renames guns with proper names for a more generic name and edits their desc.
 2018-12-04 20:22:02 -05:00
Spades
14cc6f8440 Merge pull request #4509 from lbnesquik/Kates-Weight-Fix 
Fix stuffing breaking at extreme numbers.
 2018-12-04 20:21:31 -05:00
Spades
e9b0432420 Merge pull request #4506 from Novacat/nova-survival 
Adds Prybars to Survival Boxes
 2018-12-04 20:21:05 -05:00
Spades
76866c4e95 Merge pull request #4498 from Screemonster/chimchimenee 
adds umbrellas to xenoarch lockers
 2018-12-04 20:20:34 -05:00
Spades
6f8488796b Merge pull request #4544 from ArgobargSoup/ArgoLessSnippyResponse 
A less snippy automatic response for IC issues.
 2018-12-04 20:18:39 -05:00
ArgobargSoup
a7139093b3 Adds a VStation Edit. 2018-12-04 14:11:00 -08:00
ArgobargSoup
7fea35c246 Fixes a little grammar/spelling error. 2018-12-04 13:57:01 -08:00
ArgobargSoup
d68ba3ae23 Changes IC Issue response to be a bit less snippy. 2018-12-04 13:52:45 -08:00
Verkister
700a62dfee Fixes some layering issues on taur/borg riding. 
-Proper layering is no longer ignored for every non-north direction.
-Also bumped borg riding offset upwards by couple pixels to better match the back height.
 2018-12-04 17:13:48 +02:00
Spades
4579aed0ed Merge pull request #4499 from VOREStation/aro-darkphoto 
Combine photosensitive trait with darksight
 2018-12-02 13:54:08 -05:00
Verkister
d90f0bbf92 Fixes digestive analyzer missing sync button 
I have no idea how that happened.
 2018-12-02 12:36:22 +02:00
Spades
822a9eff0e Merge pull request #4500 from lm40/master 
Adds Kenzie's hypospray
 2018-12-01 12:29:53 -05:00
Spades
ff0ed7d103 Merge pull request #4490 from HungryMoth/BugLanguage 
Gives Vasilissans a language finally / Bug-Speak
 2018-12-01 11:02:20 -05:00
Atermonera
5a6ae50b14 Merge pull request #5643 from lbnesquik/Kates-Mech-Tweaks 
Mech noises update.
 2018-12-01 00:36:05 -05:00
Atermonera
034c3e6615 Merge pull request #5649 from lbnesquik/Kates-Flashlight-F 
ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
 2018-12-01 00:33:49 -05:00
Atermonera
63b01a6408 Merge pull request #5742 from Nalarac/patch-3 
Changes Mech Diamond Drill Cooldown
 2018-12-01 00:32:36 -05:00
Atermonera
67967c93af Merge pull request #5736 from SpadesNeil/pistol-ammo-fixes 
Fixes missing hollow point ammo for 9mm
 2018-12-01 00:28:04 -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
3fb5d15c43 Merge pull request #5718 from kartagrafi/hairunderwearwhatever 
New hair + underwear
 2018-12-01 00:17:11 -05:00
HungryMoth
8b56ee84a9 Removed Sol Common from Vasi's 2018-11-30 23:16:24 -05:00
HungryMoth
8c1d835b38 Gives Vasilissans the language by default 2018-11-27 13:41:44 -05:00
HungryMoth
3ce47937a4 Updated Lore for Vasilissans 2018-11-27 13:36:52 -05:00