Cebutris
95a86ad1c4
foxicide fluff items
2020-01-13 19:27:33 -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
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
105f13e03c
Merge pull request #6424 from drexample/gnot-sure
...
You've been gnomed.
2020-01-12 22:02:41 -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
Atermonera
b262b4ac96
Merge pull request #6623 from Heroman3003/radfix
...
Fixes calculation of wall rad resistance
2020-01-12 18:18:17 -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
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
dcf9a12a12
Update disposal-construction.dm
2020-01-12 00:34:06 -08:00
Holdelta
c600762039
Add files via upload
2020-01-11 23:39:05 -08:00
Holdelta
b24d324ad9
Update station_vr.dm
2020-01-11 23:38:00 -08:00
Holdelta
2bcd08a098
Update station.dm
2020-01-11 23:37:06 -08:00
RadiantFlash7
7de718e369
Revert "Revert "2.21""
...
This reverts commit d3885d57f4
2020-01-12 01:20:36 -05:00
RadiantFlash7
6362eac935
Revert "Revert "2.2""
...
This reverts commit d71cb2b6e2
2020-01-12 01:20:03 -05:00
RadiantFlash7
15993154b7
Revert "Revert "Fixes shuttle space tiles+mobtemp""
...
This reverts commit 719d42cbb4
2020-01-12 01:19:55 -05:00
RadiantFlash7
faf6e95ce3
Revert "Revert "Major map change+misc changes""
...
This reverts commit f0d4f38bf1
2020-01-12 01:19:47 -05:00
RadiantFlash7
f0d4f38bf1
Revert "Major map change+misc changes"
...
This reverts commit fd22b5ca87
2020-01-12 01:16:31 -05:00
RadiantFlash7
719d42cbb4
Revert "Fixes shuttle space tiles+mobtemp"
...
This reverts commit f1cac2635d
2020-01-12 01:16:25 -05:00
RadiantFlash7
d71cb2b6e2
Revert "2.2"
...
This reverts commit 08877da8ad
2020-01-12 01:16:10 -05:00
RadiantFlash7
d3885d57f4
Revert "2.21"
...
This reverts commit eacbccd7db
2020-01-12 01:15:59 -05:00
RadiantFlash7
eacbccd7db
2.21
...
Missed one.
I hate life.
2020-01-11 23:09:59 -05:00
RadiantFlash7
08877da8ad
2.2
...
Litterally, 1 space snuck into the variable, and ruined my perfect update.
2020-01-11 23:06:50 -05:00
Repede
961160e169
Merge branch 'master' into master
2020-01-11 23:01:05 -05:00
RadiantFlash7
f1cac2635d
Fixes shuttle space tiles+mobtemp
...
Allows mobs on cryogaia to survive in frigid conditions
replaces a few space tiles with turfs,
Also changes out all non shuttle/turfs on shuttles to shuttle turfs.
(caused space tiles)
2020-01-11 22:19:08 -05:00
Verkister
8cc8f73ccc
Fixes mob riding double input exploit
...
The rider's movement input is now ignored if the mount has moved within the last second.
2020-01-12 02:09:56 +02:00
RadiantFlash7
fd22b5ca87
Major map change+misc changes
...
Moves holodeck next to AI core,
expands botany and kitchen, adds fishfarm
Adds photocopiers and pappershredders about.
Fixes some bad cameras,
adds detective pistol back in, Why wasn't it there prior?
Adds ballestics back in.
2020-01-11 18:41:51 -05:00
Shadow
879ba15398
Re-Awooening
...
Fix
2020-01-11 12:04:40 -06:00
Novacat
af973e5bde
Merge pull request #6428 from lbnesquik/Taur-clothes-fix
...
Poncho is now in the loadout as well, with a little pointer to notify people it can do taur stuff
2020-01-11 11:35:00 -05:00
Kates
930215e3d7
Update loadout_suit_vr.dm
2020-01-11 17:07:29 +01:00
Verkister
bcced2f53b
Fixes sleeperbellies not supplying air to occupant
...
Fixes sleeperbellies forcing the occupant to breathe external atmosphere and killing the occupant in hostile external environments.
2020-01-11 17:13:10 +02:00
