cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,589 Commits 6 Branches 0 Tags
d9b78abb7f95f289d49dd0a06a358595141d1e3d
Commit Graph

36912 Commits

Author SHA1 Message Date
Gear
d9b78abb7f item/weapon rather than item/gun 2020-01-15 13:10:04 -05:00
Gear
bb7a1e42d3 Forgot this. Whoops. 2020-01-15 10:33:52 -05:00
Gear
4870d36b13 Modify guns to add pin support. 2020-01-15 10:31:54 -05:00
Gear
838ffff465 Create firing pin definitions 2020-01-15 08:42:24 -05:00
TheFurryFeline
ec4f6ccfc1 Spelling Fix 
Title.

Changelog Notes:

- Fixes spelling for bluespace body bag desc.
 2020-01-14 15:17:08 -05:00
Ketrai
8095e02124 woops 2020-01-14 19:23:50 +01:00
Ketrai
b88a7351e2 Update Chemistry-Reagents-Food-Drinks_vr.dm 2020-01-14 19:12:45 +01:00
Ketrai
b979bdf5b4 Update Chemistry-Reagents-Food-Drinks_vr.dm 2020-01-14 19:08:42 +01:00
Ketrai
b957f1bfee Removes gnome meme sounds from harvest. 2020-01-14 19:07:26 +01:00
Izac Joof Forsgren
ddbe5ee749 Merge branch 'master' into patch-2 2020-01-14 16:43:30 +01:00
TheFurryFeline
7361dd049c Add a YW Comment 
Title.

Changelog Notes:

- Adds YW Addition comment to new chicken mob which was missed with a map change PR.
 2020-01-14 10:13:08 -05:00
TheFurryFeline
26b10087b6 Spelling Fixy 
Title. Going through the changes that's come downstream and found this little tidbit. Might have a few other PRs along the way.

Changelog Notes: 

- Fixes a spelling error with Uber Deathclaw desc.

- Also tweaks comment phrasing.
 2020-01-14 10:04:21 -05:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Hawk_v3
f641220882 Compilation fixing, and Phorochem depreciation fix. 
We should now be good to go! Praise Travis!
 2020-01-13 20:07:30 +00:00
Hawk_v3
6dcf1520b4 Let's get this wrapped up and ready to go. 
Removed all KHI references, and the Vore AI Law stuff.
 2020-01-13 19:38:10 +00:00
izac112
f093367c69 fixed stupid tab 2020-01-13 20:32:30 +01:00
izac112
097d8e8790 Removes the "Physical" sides of the sleeving sickness 
Aka the brute, burn, pain and melee damage modifiers.

Signed-off-by: izac112 <izac10@live.com>
 2020-01-13 20:29:07 +01:00
izac112
8423b036b8 Reduces duration to 25 minutes on a un-upgraded machine 2020-01-13 20:27:24 +01:00
izac112
5713226986 Vore death or not should be the same 2020-01-13 20:19:18 +01:00
Hawk_v3
4c18d156cd Actual fix. 
Commas MUST go on the end of comments in the middle of a list. The fail is normally the line ABOVE the one Travis reports.
 2020-01-13 19:06:19 +00:00
Hawk_v3
f36bda0ffd Or is this the list fix? I can't read AWK and regex. 
I know where the file IS, just...
 2020-01-13 19:01:15 +00:00
Hawk_v3
33c345c34a Fixing lists for merge. 
Missing commas, man.
 2020-01-13 18:45:44 +00:00
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Novacat
d7962d0448 Merge pull request #6441 from Heroman3003/droppodfix 
Fixes droppod spawning wrong subtype
 2020-01-13 09:10:04 -05:00
Heroman3003
9e31d82dd5 Decreases chance 2020-01-13 18:16:46 +10:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Heroman
737d37321b Fixes droppod spawning wrong subtype 2020-01-13 17:48:33 +10:00
Novacat
fcd8fd1370 Merge pull request #6440 from Heroman3003/droppodfix 
Fixes drone droppod not being announced
 2020-01-13 02:04:30 -05:00
Heroman
aa53bdc0ed Fixes drone droppod not being announced 2020-01-13 16:51:12 +10:00
Novacat
c1a52de67b Merge pull request #6438 from Heroman3003/dronefix 
Makes drone age restriction based on config setting too
 2020-01-13 01:37:11 -05:00
Heroman
4551f97924 Makes drone age restriction based on config setting too 2020-01-13 14:56:27 +10:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER 
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
 2020-01-12 22:14:17 -05:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Novacat
7344a6f953 WE ALWAYS DELIVER!! 2020-01-12 22:02:04 -05:00
Hawk_v3
c51046191b Merge remote-tracking branch 'upstream/upstream-merge-6623' 2020-01-13 00:02:11 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Holdelta
9c7e1f82af Fixing Travis formatting part 2 
Adding a parenthesis at the end of a comment because Travis.
 2020-01-12 15:44:47 -08:00
Hawk_v3
697641a913 Indentation Fix 
Travis checks for proper closure. While this might not actually fix it, it's expecting to see ) at the end of the line, as I've run into this one before.
 2020-01-12 23:30:34 +00:00
Atermonera
b262b4ac96 Merge pull request #6623 from Heroman3003/radfix 
Fixes calculation of wall rad resistance
 2020-01-12 18:18:17 -05:00
Novacat
4068f95211 Merge pull request #6435 from Heroman3003/dronelimit 
Increases timegate for cyborgs to 3 days
 2020-01-12 17:20:29 -05:00
Heroman
eee8ecd2e5 Increases timegate for cyborgs to 3 2020-01-13 08:04:18 +10:00
Novacat
5e9b50c81f Merge pull request #6434 from Heroman3003/livepods 
Makes drone pods remain active after first attempt
 2020-01-12 17:04:00 -05:00
Novacat
0a58fb115c Merge pull request #6433 from Heroman3003/dronelimit 
Adds a timegate on playing maintenance drones
 2020-01-12 17:03:43 -05:00
Heroman
06b5064a8e Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter 2020-01-13 07:21:48 +10:00
Heroman
de03c4e3e3 Adds a timegate on playing maintenance drones 2020-01-13 06:19:10 +10:00
Repede
17d336009e Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:57:03 -05:00
Repede
e671d2d799 Merge branch 'master' into Howl'n 2020-01-12 14:36:47 -05:00
Repede
2d453d354b Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:36:25 -05:00
RadiantFlash7
cda5c1e3e3 YW comment eddits 
Proper commenting.
 2020-01-12 12:08:08 -05:00
Holdelta
6b83f6010e Update RPD.dm 2020-01-12 00:35:04 -08:00