cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,468 Commits 6 Branches 0 Tags
f932e65178c1fa518a49643b10fb3099727f190d
Commit Graph

41954 Commits

Author SHA1 Message Date
Chompstation Bot
f932e65178 Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss 2020-11-15 08:44:14 +00:00
Razgriz
135995c769 Merge pull request #770 from cadyn/admintele 
Admin teleport verb
 2020-10-28 21:41:00 -07:00
Razgriz
6a6c527aca Merge pull request #772 from CHOMPStationBot/upstream-merge-9086 
[MIRROR] Allow video calls with NIF commlinks
 2020-10-28 21:37:49 -07:00
Razgriz
c92d0d0148 Merge pull request #771 from CHOMPStationBot/upstream-merge-9260 
[MIRROR] Update phoron bore vender paths
 2020-10-28 21:14:21 -07:00
Razgriz
d88ccdabf6 Merge pull request #759 from CHOMPStationBot/upstream-merge-9207 
[MIRROR] [MIRROR] Phoron bore utility improvements
 2020-10-28 20:21:26 -07:00
Razgriz
f1ad20fed4 Update examine.dm 2020-10-28 18:47:25 -07:00
Razgriz
6ce0de0fdb Update human_movement.dm 2020-10-28 18:37:25 -07:00
Razgriz
f8d66d3f54 Update living_vr.dm 2020-10-28 18:36:19 -07:00
Razgriz
5992126672 Update living_vr.dm 2020-10-28 18:35:45 -07:00
Razgriz
e900aa66d1 Update survey_vendor.dm 2020-10-28 18:16:57 -07:00
Razgriz
d64eec25f1 Update equipment_vendor.dm 2020-10-28 18:15:56 -07:00
Razgriz
b89c2e6f4d Merge pull request #775 from MisterGrimm/ScreamForMe 
Add screams for xenomorphs and xenomorph hybrid
 2020-10-28 14:57:09 -07:00
Sym
6ef2a80baf Scream sounds for xenomorph and xenomorph hybrid 2020-10-28 17:26:14 -04:00
Verkister
03ef028939 Merge pull request #9086 from ShadowLarkens/nif_streaming 
Allow video calls with NIF commlinks
 2020-10-28 13:08:54 +00:00
Verkister
9311af3423 Merge pull request #9260 from Cyantime/patch-3 
Update phoron bore vender paths
 2020-10-28 12:47:15 +00:00
Razgriz
b43ae1a006 Merge pull request #767 from CHOMPStationBot/upstream-merge-9259 
[MIRROR] Enables OOC during votes
 2020-10-28 04:59:21 -07:00
Nadyr
766204a4f4 Merge pull request #717 from CHOMPStationBot/upstream-merge-9229 
[MIRROR] [MIRROR] adds VR thunderdome to CentComm area
 2020-10-28 05:57:36 -04:00
Cadyn
dd7f3555d0 Admin teleport verb addition 2020-10-28 02:28:19 -07:00
Nadyr
3b8655f2e4 Merge pull request #768 from CHOMPStationBot/upstream-merge-9257 
[MIRROR] This is *not* what _onclick is for FFS
 2020-10-28 05:01:59 -04:00
Verkister
420b44c449 Merge pull request #9257 from ShadowLarkens/paifix 
This is *not* what _onclick is for FFS
 2020-10-28 07:11:48 +00:00
Verkister
712a1a5860 Merge pull request #9259 from Cyantime/patch-3 
Enables OOC during votes
 2020-10-28 07:11:41 +00:00
Razgriz
1c382db57d Merge pull request #751 from MisterGrimm/TheseAreMicroStuff 
Changes names and descriptions of micro mech equipment
 2020-10-27 02:19:16 -07:00
Razgriz
f164c8212a Merge pull request #763 from CHOMPStationBot/upstream-merge-9252 
[MIRROR] [MIRROR] Stops slime securitrons from going ballistic when they get scratched
 2020-10-27 02:17:35 -07:00
Razgriz
21c2623f84 Merge pull request #762 from CHOMPStationBot/upstream-merge-9243 
[MIRROR] Adds the ability to hide, or reveal one's own wings with a verb
 2020-10-27 02:16:17 -07:00
Razgriz
545b1a8486 Merge pull request #761 from CHOMPStationBot/upstream-merge-9253 
[MIRROR] [MIRROR] Adds new balloons
 2020-10-27 02:15:44 -07:00
Razgriz
548c123e77 Merge pull request #760 from CHOMPStationBot/upstream-merge-9225 
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 02:15:15 -07:00
Razgriz
34fcd2bcad Merge pull request #585 from MisterGrimm/ScreamForMe 
Added TGstation scream sound effects, and tweaked scream sound effect code.
 2020-10-27 02:08:15 -07:00
Verkister
c035527969 Merge pull request #9252 from VOREStation/upstream-merge-7738 
[MIRROR] Stops slime securitrons from going ballistic when they get scratched
 2020-10-27 08:18:54 +00:00
Verkister
ea6b6274ed Merge pull request #9243 from Runa-Dacino/Hidewingstry2 
Adds the ability to hide, or reveal one's own wings with a verb
 2020-10-27 08:17:46 +00:00
Verkister
b7f4c2192c Merge pull request #9253 from VOREStation/upstream-merge-7748 
[MIRROR] Adds new balloons
 2020-10-27 08:17:38 +00:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Verkister
57adb0bfca Merge pull request #9207 from VOREStation/upstream-merge-7680 
[MIRROR] Phoron bore utility improvements
 2020-10-27 08:16:22 +00:00
Razgriz
7d2b99504f Merge pull request #755 from CHOMPStationBot/upstream-merge-9250 
[MIRROR] Add Lamia Mobs (sprites by Prof. Smokey!)
 2020-10-27 01:13:24 -07:00
Sym
1b91203232 Most species can't use scream sounds now 
Not including those that already have scream sounds.
 2020-10-26 13:34:39 -04:00
Chompstation Bot
04a00319a7 Add Lamia Mobs (sprites by Prof. Smokey!) 2020-10-26 17:03:13 +00:00
Shadow-Quill
399dc17687 Fruit TRUE/FALSE 2020-10-25 23:24:56 -05:00
Nadyr
86e4507202 Merge pull request #753 from Darlantanis/PitcherPlantTweaks 
Nerfs space vine pitcher plants
 2020-10-26 00:18:25 -04:00
Nadyr
30717d0f05 Merge pull request #749 from cadyn/linguist 
Cadyn's traits changes part 1
 2020-10-26 00:01:38 -04:00
Nadyr
773f113e2e Merge pull request #748 from r4d6/Prosthetic-Limbs 
Allow for more prothestic designs to be made and FPB Torsos are no longer black.
 2020-10-25 23:51:15 -04:00
Darlantan
c9d60805b7 Nerfs space vine pitcher plants 
Also makes pitchers drop fruit on death, if they have a fruit.
 2020-10-25 23:43:20 -04:00
r4d6
47b68cbe86 Make Tesh Limbs printable again. 2020-10-25 22:48:33 -04:00
Sym
49d70a6f42 Makes micro equipment more obvious 
Because this is desperately needed.
 2020-10-24 10:49:31 -04:00
r4d6
0979453dab Make the more fancy limbs unable to be printed right away. 2020-10-24 09:06:39 -04:00
Nadyr
4835643840 Merge pull request #586 from cadyn/blitzrods 
Blitz rods
 2020-10-24 01:07:02 -04:00
Razgriz
d1d2e5905c Merge pull request #744 from cadyn/husksurgery 
Adding dehusk and tox/oxyloss surgery
 2020-10-23 19:57:51 -07:00
Razgriz
53bbc74d65 Merge pull request #707 from CHOMPStationBot/upstream-merge-9213 
[MIRROR] Lets all heads set alert level, restores "Station Time" option to status displays
 2020-10-23 19:55:59 -07:00
Razgriz
23defa0ac2 Merge pull request #747 from Darlantanis/PitcherPlants 
Pitcher plants
 2020-10-23 19:52:13 -07:00
Nadyr
2771750972 Update pitcher.dm 
tweaks I missed with the suggested commits
 2020-10-23 01:19:46 -04:00
Nadyr
c2f2b7726b Apply suggestions from code review 
Suggested nutrition proc tweajs

Co-authored-by: cadyn <35672377+cadyn@users.noreply.github.com>
 2020-10-23 01:08:01 -04:00
cadyn
605a14266a More excludy boyos 2020-10-22 21:27:58 -07:00