Commit Graph

625 Commits

Author SHA1 Message Date
jjpark-kb
3d40cca968 no more storms on lower zlevel 2020-07-18 03:35:18 -04:00
Dahlular
5a6a1ecd46 Merge pull request #333 from Jay-Sparrow/cloning
Cloning fix
2020-07-17 19:39:51 -06:00
Dahlular
9ee66ce9a8 Merge pull request #335 from Jay-Sparrow/antags
Nerf rate of kill objectives
2020-07-17 19:38:54 -06:00
JaySparrow
36e314a2d1 Nerf rate of kill objectives
Less murder
2020-07-17 20:24:01 -05:00
Jay-Sparrow
b6c4bc088b Merge branch 'master' into cloning 2020-07-17 19:42:19 -05:00
jjpark-kb
bc43bb59cd Merge remote-tracking branch 'hyper/master' into xenoarchtime 2020-07-17 20:40:53 -04:00
Dahlular
cf6fbfbd18 Merge pull request #332 from jjpark-kb/youneedradialsson
porting some radials
2020-07-17 18:22:34 -06:00
jjpark-kb
542ceb7996 Merge remote-tracking branch 'hyper/master' into xenoarchtime 2020-07-17 20:07:33 -04:00
Dahlular
281082329f Merge pull request #330 from jjpark-kb/okaysothereareproblems
small amount of fixes
2020-07-17 18:04:55 -06:00
Dahlular
23220db465 Merge pull request #324 from jjpark-kb/addvscodeplease
Adds VSCODE stuff
2020-07-17 17:18:43 -06:00
JaySparrow
e5592937aa Cloning fix
Clone pod works more than once, and resizes characters
2020-07-17 17:14:01 -05:00
jjpark-kb
d1e22462ad lots of radial stuff 2020-07-17 17:58:30 -04:00
JaySparrow
af4bf42d01 Revert "Revert "DNC weirdness""
This reverts commit c8d666cd34.
2020-07-17 16:26:37 -05:00
JaySparrow
546f3a993c Revert "Revert "Do Not Clone""
This reverts commit 05acfc1f72.
2020-07-17 16:26:32 -05:00
jjpark-kb
24e989cb34 there, I got chasms to work now 2020-07-17 04:17:38 -04:00
jjpark-kb
b94acd3962 xenoarch yes 2020-07-17 03:46:44 -04:00
JaySparrow
05acfc1f72 Revert "Do Not Clone"
This reverts commit 3c572f0d6e.
2020-07-17 00:22:23 -05:00
JaySparrow
c8d666cd34 Revert "DNC weirdness"
This reverts commit 49ac30a0b4.
2020-07-17 00:21:59 -05:00
jjpark-kb
89409ee834 adding xenoarch 2020-07-16 23:33:06 -04:00
jjpark-kb
6ce26a163f okay, here are some changes 2020-07-16 22:27:26 -04:00
Dahlular
fc127651b1 Merge pull request #322 from Chemlight/Uniform-Armor-Update
Uniform armor changes
2020-07-16 02:28:21 -06:00
Dahlular
23becf948c Merge pull request #327 from Jay-Sparrow/Size-code
Health and speed relative to size
2020-07-16 02:27:43 -06:00
JaySparrow
36257c0d9a SIZE CODE
3 AM, WOOO. MAYBE IT WORKS NOW.
2020-07-16 03:05:10 -05:00
Dahlular
756aa7b2af Merge pull request #321 from Jay-Sparrow/Husk-Fix
Husks and donuts
2020-07-15 22:17:07 -06:00
jjpark-kb
1d33f7f1fb ports the vscode stuff from tg 2020-07-15 22:15:51 -04:00
Chemlight
ebf1815020 Missed a spot
Found RD uniform had a 35% acid still.
2020-07-14 19:46:26 -07:00
Chemlight
a4262cd75f Uniform armor changes
SS13 in the code had several armor values on uniforms that had values beyond the percentage of 10, things like 60% to 80% fire resist on a uniform which can stack, although the fire can destroy the uniform for example, it won't harm the player for the duration it's still in good condition, leaving to some strange encounters in fights. Ontop of this some uniforms for jobs such as roboticist, atmos tech have been given values better suit all the other uniforms, while heads of departments are given the 10% armor protection much like security uniforms, makes sense as a head has to be protected, while the captain gets a 10% all around protection.
2020-07-14 19:36:22 -07:00
JaySparrow
8ef0e74ec9 Husks and donuts
Fixes various dehusking methods, and also donut crafting.
2020-07-14 19:35:27 -05:00
Dahlular
ec9fdff987 Merge pull request #320 from SaintHusky/MoreTitty
A new size also, sprite colouring fixes
2020-07-14 17:20:26 -06:00
Dahlular
938cc28c82 Merge pull request #319 from Jay-Sparrow/bounties
Lewd bounties
2020-07-14 17:06:47 -06:00
Dahlular
dfaf49573a Merge pull request #317 from Chemlight/Make-Virology-Great-Again
Reverse Engineering Virology from Beeviro
2020-07-14 17:04:38 -06:00
SaintHusky
6f41e5e36d Actualy removed blood from lactable fluids.
Why was it even there?
2020-07-14 20:29:20 +02:00
SaintHusky
7bb316750a A new size also, sprite colouring fixes
Mooooore titty sizes.
2020-07-14 19:28:00 +02:00
Dahlular
77fa902c99 REMOVES BLOOD TITS 2020-07-14 01:35:21 -06:00
JaySparrow
7e8ea19b69 Lewd bounties
Milk the crew. Get paid. This is the FUTURE.
2020-07-13 22:13:05 -05:00
Chemlight
ee62657a24 Reverse Engineering Virology from Beeviro
Attempted to fix virology as the current addition/changes were incomplete with the individual working on it just disappearing and just leaving it in it's current state, this change will revert back virology to the old system with the old symptoms and stats as it was before. (hopefully)
2020-07-13 15:57:22 -07:00
Dahlular
18ba11ca9d Merge pull request #310 from Oposshim/goldenplaque
kin.corp addons
2020-07-13 00:23:43 -06:00
Dahlular
6d3cac3ce5 Merge pull request #315 from Jay-Sparrow/Synthlegs
Synths
2020-07-13 00:14:18 -06:00
JaySparrow
ff689c1b12 Mammals
Fucking sprites. Fuuuuuckin sprites. Fuuuuuck.
2020-07-12 18:53:26 -05:00
JaySparrow
d22532585d Synths
Fuckin no brim robot assholes fuckin wrecking the code fuck.
2020-07-12 15:24:26 -05:00
Dahlular
58a667e35f lorebook 1 2020-07-11 21:24:33 -06:00
Dahlular
95b1e0b94b Merge remote-tracking branch 'upstream/master' into radiance 2020-07-11 16:37:53 -06:00
Dahlular
43ed6b41f9 fixes stepping under interactions and allows more size pref sizes
unga dunga
2020-07-10 23:50:10 -06:00
Oposshim
2e0ce45a75 kin.corp addons
dahl wanted the drop pod tweaked. I also threw in a bonus to cheer him up a lil'
2020-07-10 19:40:21 -04:00
CygnusB
dac9ba1246 ports malric plushie
hell yes
2020-07-10 02:46:05 -03:00
QuoteFox
59fbeae9d4 Merge pull request #306 from Jay-Sparrow/No-clone
DNC Fix
2020-07-10 01:00:11 +01:00
Dahlular
528a184f55 im tired and forgot to do work 2020-07-09 14:48:39 -06:00
JaySparrow
49ac30a0b4 DNC weirdness
Do not clone made all sorts of weird stuff happen by accidentally sharing an ID with a changling trait. DNC users should now be able to be debrained, and have blood again. Sorry!
2020-07-09 13:30:04 -05:00
Oposshim
82d190b276 another poss to kin lore pull
nuff said
2020-07-09 03:01:26 -04:00
Oposshim
6fa390975d Merge remote-tracking branch 'upstream/master' into call-it-whatever-the-fuck-i-want 2020-07-09 02:54:49 -04:00