Thalpy
|
926bd65392
|
Merge branch 'master' into FermiChem
|
2019-05-11 14:14:20 +01:00 |
|
Fermi
|
6a17d66323
|
Should be most compiling errors fixed outside of outdated merge problems
|
2019-05-11 14:04:43 +01:00 |
|
Fermi
|
6466ef562c
|
100 down, 66 to go.
|
2019-05-11 02:05:25 +01:00 |
|
Fermi
|
29d4a2fdde
|
Finished MCchem, now to fix compling errors.
|
2019-05-11 00:14:04 +01:00 |
|
Fermi
|
ac8b7be45c
|
Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA)
|
2019-05-10 03:10:42 +01:00 |
|
Thalpy
|
5287f3f9c7
|
Merge branch 'master' into pr/7
|
2019-05-10 02:20:19 +01:00 |
|
Fermi
|
7d567fee63
|
MC chem 5.5/6
|
2019-05-10 02:00:17 +01:00 |
|
Fermi
|
854c0097d4
|
MC 5/6th done, probably.
|
2019-05-08 23:13:51 +01:00 |
|
kevinz000
|
a7192734dd
|
Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
|
2019-05-08 01:34:33 -07:00 |
|
Fermi
|
1385e12fe3
|
MC 4/6th done
|
2019-05-07 23:38:50 +01:00 |
|
deathride58
|
2b1261ab03
|
Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
|
2019-05-07 02:19:40 -04:00 |
|
deathride58
|
f318ad7d1b
|
Merge pull request #8278 from Trilbyspaceclone/patch-106
Buffs blob Shield armor, as well as weaken state
|
2019-05-06 22:13:50 -04:00 |
|
deathride58
|
5e2a9669d1
|
Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45
vent_clog event now respects vent welding
|
2019-05-06 22:08:43 -04:00 |
|
deathride58
|
24cfef7329
|
Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48
disables skewium due to severe code issues
|
2019-05-06 22:08:16 -04:00 |
|
deathride58
|
9d6f85d555
|
Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47
adds message monitor to telecomms technode
|
2019-05-06 22:04:12 -04:00 |
|
deathride58
|
0d65e3d1ab
|
Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
|
2019-05-06 21:58:44 -04:00 |
|
deathride58
|
aaa06473b7
|
Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
|
2019-05-06 21:23:55 -04:00 |
|
deathride58
|
bb9c479566
|
Merge pull request #8313 from BurgerLUA/SlurringFix
Fixes a few Slurring bugs
|
2019-05-06 21:00:33 -04:00 |
|
Trilbyspaceclone
|
9aa74f4fc2
|
Update all_nodes.dm
|
2019-05-06 19:58:45 -04:00 |
|
Fermi
|
f31a46e029
|
Fixed a few things, 1/2 way through MC chem.
|
2019-05-05 20:32:07 +01:00 |
|
Trilbyspaceclone
|
5e5c470dc9
|
Update all_nodes.dm
|
2019-05-05 06:51:10 -04:00 |
|
Trilbyspaceclone
|
cc34a8fa4e
|
Update all_nodes.dm
|
2019-05-05 06:47:03 -04:00 |
|
Trilbyspaceclone
|
5904d1d281
|
Update power_designs.dm
|
2019-05-05 06:45:40 -04:00 |
|
kevinz000
|
383cae2949
|
Merge pull request #8317 from deathride58/herewegoagain
[s] Clamps biogen amount to a sane amount
|
2019-05-04 23:18:36 -07:00 |
|
kevinz000
|
1b387eb5e3
|
Merge pull request #8314 from Poojawa/mawp
Mawp
|
2019-05-04 23:18:14 -07:00 |
|
kevinz000
|
1caa3ba720
|
Merge pull request #8315 from Trilbyspaceclone/patch-115
Maybe fixes laser carbine sprites
|
2019-05-04 23:17:51 -07:00 |
|
Fermi
|
b71bc7d9dc
|
Added happiness, psicodine, neurine and 2/6th of MC chem
|
2019-05-04 17:50:43 +01:00 |
|
Fermi
|
bca578ab2c
|
About 1/6th done of MC base code
|
2019-05-03 03:02:37 +01:00 |
|
BurgerLua
|
1557c33008
|
Adds Penis Enlargement Pills
|
2019-05-02 14:55:04 -07:00 |
|
Fermi
|
f92995bc13
|
Mid MC
|
2019-05-02 11:34:42 +01:00 |
|
Fermi
|
e70eac8f53
|
Futher fixes and for some reason something broke arrrghhh.
|
2019-05-02 08:44:06 +01:00 |
|
deathride58
|
7dd5e563b0
|
Clamps biogen amount to a sane amount
|
2019-05-02 00:21:38 -04:00 |
|
Trilbyspaceclone
|
831e450b3f
|
Update weapon_designs.dm
|
2019-05-01 16:08:17 -04:00 |
|
Trilbyspaceclone
|
150db880de
|
Update laser.dm
|
2019-05-01 16:07:11 -04:00 |
|
Trilbyspaceclone
|
fd251d3dd2
|
Update laser.dm
|
2019-05-01 15:15:29 -04:00 |
|
Poojawa
|
faeb4bc22d
|
Mawp
Mawp
|
2019-05-01 00:58:19 -05:00 |
|
BurgerLua
|
b31127bcca
|
Forgot this
|
2019-04-30 22:26:44 -07:00 |
|
Poojawa
|
be0829af53
|
cleans up loadout screen, fixes some suits, tweaks a few digi hand-holes
|
2019-05-01 00:10:27 -05:00 |
|
Poojawa
|
9374e83e7d
|
fixes armor plate oversight
|
2019-05-01 00:05:14 -05:00 |
|
BurgerLua
|
d3b856d95f
|
slurring reduction
|
2019-04-30 22:00:27 -07:00 |
|
BurgerLua
|
22c0c9baec
|
Slurring Fix
|
2019-04-30 21:29:28 -07:00 |
|
kevinz000
|
534b5f0287
|
Merge pull request #8309 from Trilbyspaceclone/Food-5
Better sushi crafting, and tuna based food - Works addtion
|
2019-04-30 05:42:30 -07:00 |
|
kevinz000
|
7466f48674
|
Merge pull request #8288 from BurgerLUA/Accesssssssssssss
Accessory Clothing Mayhem, or how I lost my fucking sanity making this PR.
|
2019-04-30 05:37:02 -07:00 |
|
kevinz000
|
7fe7b2d30f
|
Merge pull request #8286 from BurgerLUA/AlcoholTweaks
Tweaks how Slurring works and makes slurring directly proportional to drunkeness.
|
2019-04-30 05:32:20 -07:00 |
|
kevinz000
|
cbc0607086
|
Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
|
2019-04-30 05:31:33 -07:00 |
|
kevinz000
|
d4721e876e
|
Merge pull request #8294 from Trilbyspaceclone/shotgun_sprites
Shotgun sprites options - Fract Request
|
2019-04-30 05:30:00 -07:00 |
|
kevinz000
|
970dc85b62
|
Merge pull request #8289 from Trilbyspaceclone/patch-111
Buffs cap hat and HOP hat
|
2019-04-30 05:18:52 -07:00 |
|
kevinz000
|
7c1d7b60d0
|
Merge pull request #8287 from Trilbyspaceclone/Lock_and_key
Lockable Collars - Requested by Frack
|
2019-04-30 05:18:14 -07:00 |
|
Fermi
|
5ade1a27f0
|
Everything fixed.
BE largement (probably) fully functional
PE I think has issues ripping clothes?
|
2019-04-30 05:43:49 +01:00 |
|
Fermi
|
4bd2da202b
|
Added OwO chem,
Fixed asset growth
Added new sprites
|
2019-04-30 01:02:01 +01:00 |
|