jjpark-kb
bc43bb59cd
Merge remote-tracking branch 'hyper/master' into xenoarchtime
2020-07-17 20:40:53 -04:00
Dahlular and GitHub
6bacd1051f
Merge pull request #328 from jjpark-kb/sciencemashup
...
box map edit: small science layout change
2020-07-17 18:23:30 -06:00
Dahlular and GitHub
cf6fbfbd18
Merge pull request #332 from jjpark-kb/youneedradialsson
...
porting some radials
2020-07-17 18:22:34 -06:00
jjpark-kb
2735eb8172
removed roundstart nanite
2020-07-17 20:17:11 -04:00
jjpark-kb
0d61bbc7a7
there
2020-07-17 20:09:39 -04:00
jjpark-kb
542ceb7996
Merge remote-tracking branch 'hyper/master' into xenoarchtime
2020-07-17 20:07:33 -04:00
Dahlular and GitHub
281082329f
Merge pull request #330 from jjpark-kb/okaysothereareproblems
...
small amount of fixes
2020-07-17 18:04:55 -06:00
Dahlular and GitHub
ad0bb54404
Merge pull request #329 from ToonClyde/Pubby-fixup
...
Pubby tweaks
2020-07-17 17:25:10 -06:00
Dahlular and GitHub
23220db465
Merge pull request #324 from jjpark-kb/addvscodeplease
...
Adds VSCODE stuff
2020-07-17 17:18:43 -06:00
jjpark-kb
d1e22462ad
lots of radial stuff
2020-07-17 17:58:30 -04: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
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
ToonClyde
d0a6cac161
Pubby tweaks
...
tweaked a few things on Pubby Station
2020-07-16 13:20:25 -07:00
Dahlular and GitHub
fc127651b1
Merge pull request #322 from Chemlight/Uniform-Armor-Update
...
Uniform armor changes
2020-07-16 02:28:21 -06:00
Dahlular and GitHub
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
jjpark-kb
33d0408b8d
some small fixes
2020-07-16 01:05:42 -04:00
jjpark-kb
0be0225d69
science change
2020-07-16 00:55:13 -04:00
Dahlular and GitHub
87e902f3c2
Merge pull request #325 from jjpark-kb/pharaohtoloadout
...
add pharaoh hat to loadout
2020-07-15 22:18:36 -06:00
Dahlular and GitHub
7e3713eebc
Merge pull request #323 from ToonClyde/Kinaris-Popcorn-V2
...
Kinaris popcorn trash
2020-07-15 22:18:03 -06:00
JaySparrow
cbd99e5aaf
Health and speed relative to size
...
Pikmin nerf, oh no. Health scales with size. And, being big or small nerfs speed a little.
2020-07-15 23:17:41 -05:00
Dahlular and GitHub
756aa7b2af
Merge pull request #321 from Jay-Sparrow/Husk-Fix
...
Husks and donuts
2020-07-15 22:17:07 -06:00
jjpark-kb
b4ff3c0950
add pharaoh hat to loadout
2020-07-15 22:27:08 -04:00
jjpark-kb
24d1bbeb54
also adds these
2020-07-15 22:16:32 -04:00
jjpark-kb
1d33f7f1fb
ports the vscode stuff from tg
2020-07-15 22:15:51 -04:00
ToonClyde
ec141311fb
Kinaris popcorn trash
...
oops I forgot the trash version of the popcorn bag
2020-07-15 03:15:57 -07: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 and GitHub
ec9fdff987
Merge pull request #320 from SaintHusky/MoreTitty
...
A new size also, sprite colouring fixes
2020-07-14 17:20:26 -06:00
Dahlular and GitHub
938cc28c82
Merge pull request #319 from Jay-Sparrow/bounties
...
Lewd bounties
2020-07-14 17:06:47 -06:00
Dahlular and GitHub
fe7a7c558c
Merge pull request #318 from Kabramen/poly-skirt-and-suit
...
New Poly uniforms for the loadout
2020-07-14 17:05:15 -06:00
Dahlular and GitHub
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
d042ec8aa6
Update breasts_onmob.dmi
2020-07-14 21:53:47 +02:00
SaintHusky
9dce698635
Update breasts.dm
2020-07-14 21:24:07 +02:00
SaintHusky
8516fdeb5a
Unfucked the code
2020-07-14 21:04:54 +02:00
SaintHusky
6f41e5e36d
Actualy removed blood from lactable fluids.
...
Why was it even there?
2020-07-14 20:29:20 +02:00
SaintHusky
5158bf35f6
Update chems.dm
2020-07-14 19:52:07 +02:00
SaintHusky
7bb316750a
A new size also, sprite colouring fixes
...
Mooooore titty sizes.
2020-07-14 19:28:00 +02:00
Dahlular and GitHub
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
Kabra_men
5fd54f0759
Update uniform.dm
2020-07-13 21:34:49 -03: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 and GitHub
4dfdda0623
Merge pull request #316 from ToonClyde/Kinaris-Popcorn
...
Kinaris Popcorn
2020-07-13 14:35:23 -06:00
ToonClyde
0f3f767ad7
Kinaris Popcorn
...
New Kinaris flavor branded popcorn
2020-07-13 13:23:24 -07:00
Dahlular and GitHub
18ba11ca9d
Merge pull request #310 from Oposshim/goldenplaque
...
kin.corp addons
2020-07-13 00:23:43 -06:00
Dahlular and GitHub
6d3cac3ce5
Merge pull request #315 from Jay-Sparrow/Synthlegs
...
Synths
2020-07-13 00:14:18 -06:00
Oposshim
0b3bad639a
w.i.p overhaul
...
this pull is okay to check, but there is an extra bloody foot print for jackboots that will have to be implimented at a later date.
2020-07-13 01:23:46 -04:00