 Poojawa
|
8dc5fccfa7
|
fixes darksabre stuff
adjusts naga sprite. need to make all suits transferred over.
|
2019-05-18 21:14:19 -05:00 |
|
|
Fermi
|
791d021d50
|
Even more fixes.
|
2019-05-19 01:37:20 +01:00 |
|
|
Fermi
|
a837eda98b
|
More fixes.
|
2019-05-18 22:50:20 +01:00 |
|
|
Fermi
|
0b564e7e87
|
Fix
|
2019-05-18 04:09:33 +01:00 |
|
|
Fermi
|
0700e0c080
|
Near completion - missing Neko's pH paper and reaction vars.
|
2019-05-18 03:02:14 +01:00 |
|
|
Fermi
|
2f75f861ce
|
Explode proc set up
|
2019-05-18 01:19:04 +01:00 |
|
|
Fermi
|
cabf490134
|
Fixed compiling errors for Neko.
|
2019-05-17 16:57:42 +01:00 |
|
|
kevinz000
|
77232cc4bb
|
Merge pull request #8365 from Poojawa/salt-inducer
[s] Increases salt 100 fold
|
2019-05-17 08:34:36 -07:00 |
|
|
Fermi
|
fa5531285a
|
Push for Neko, probably doesn't compile atm.
|
2019-05-17 16:23:34 +01:00 |
|
|
Poojawa
|
4f75f68a5d
|
make hostile mobs gurgle people
|
2019-05-17 05:13:30 -05:00 |
|
|
Poojawa
|
b95bc24def
|
mission accomplished
|
2019-05-17 04:24:23 -05:00 |
|
|
deathride58
|
d855a7eb0d
|
Merge pull request #8332 from Useroth/collars-n-shit
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
|
2019-05-17 00:10:41 -04:00 |
|
|
Poojawa
|
e4ba220eb7
|
oh god, oh fuck. why
|
2019-05-16 14:10:31 -05:00 |
|
|
Poojawa
|
0b46794ce9
|
Increases salt 100 fold
|
2019-05-16 09:43:03 -05:00 |
|
|
Poojawa
|
0f6677b956
|
Blood colors happens to footprints now.
Different prints not working. splatter effect not working, I'm just sick of looking at this right now.
|
2019-05-16 08:23:53 -05:00 |
|
|
Fermi
|
538c6e98ac
|
On-mob_life proc doesn't work for some reason. Fix it/badger helpers.
|
2019-05-16 01:26:46 +01:00 |
|
|
Fermi
|
246a344fed
|
Mreac fixed, tongue health, pH vars+ (drink, food, pryo, tox remain)
|
2019-05-16 00:58:30 +01:00 |
|
|
Fermi
|
8229b4529f
|
So sleepy
|
2019-05-15 05:39:07 +01:00 |
|
|
Fermi
|
2218956a09
|
Gearing up for PR
|
2019-05-15 05:27:09 +01:00 |
|
|
kevinz000
|
a3114d830a
|
Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
|
2019-05-14 13:48:54 -07:00 |
|
|
Fermi
|
0d907db516
|
Almost done. Just need to update reagent vars.
|
2019-05-14 21:20:38 +01:00 |
|
|
Fermi
|
76aec5a5ed
|
Holder fixes
|
2019-05-14 16:51:03 +01:00 |
|
|
Fermi
|
3229e4bf3a
|
Reverted holder, (sorry Kev)
|
2019-05-14 02:48:12 +01:00 |
|
|
Fermi
|
be27417633
|
Stuff and things
|
2019-05-13 18:07:51 +01:00 |
|
|
Trilbyspaceclone
|
62e5037eab
|
Merge branch 'master' into patch-118
|
2019-05-12 02:03:32 -04:00 |
|
|
kevinz000
|
90c3e4b776
|
Merge pull request #8322 from Trilbyspaceclone/patch-117
Buffs mag-gun recharges speed
|
2019-05-11 22:18:29 -07:00 |
|
|
Fermi
|
cadda98570
|
Added cowboy hat
|
2019-05-12 04:15:10 +01:00 |
|
|
Fermi
|
ec2f33ceb5
|
Added Hatmium and a few slight fixes.
|
2019-05-12 03:42:23 +01:00 |
|
|
Fermi
|
f7655cad25
|
All compiling errors fixed, except for a few weird ones that I need help
|
2019-05-11 15:40:06 +01:00 |
|
|
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 |
|
|
Trilbyspaceclone
|
38696f4997
|
Delete autolathe_designs.dm
|
2019-05-10 16:47:59 -04: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 |
|
|
BurgerLua
|
6df27ef2a3
|
Updated integrated circuits
|
2019-05-09 15:25:48 -07:00 |
|
|
Poojawa
|
7b6a65ce3b
|
okay we're starting to pass our blood type to bloodmeme now
STILL JUST FUCKING FOOTSTEPS LEFT THO GOD FUCKING DAMNIT
|
2019-05-09 08:17:18 -05:00 |
|
|
Useroth
|
4355584833
|
Added them to loadout too.
|
2019-05-09 12:09:18 +02:00 |
|
|
Poojawa
|
5ad532f723
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-09 03:08:54 -05:00 |
|
|
Fermi
|
1385e12fe3
|
MC 4/6th done
|
2019-05-07 23:38:50 +01: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
|
c926320902
|
Merge pull request #8320 from Citadel-Station-13/kevinz000-patch-50
adds a cell charge line to magrifle description because why would you not make energy guns display this reeeee
|
2019-05-06 20:18:55 -04:00 |
|
|
Poojawa
|
105b40a4f8
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-06 02:53:42 -05:00 |
|
|
Fermi
|
f31a46e029
|
Fixed a few things, 1/2 way through MC chem.
|
2019-05-05 20:32:07 +01:00 |
|
|
Trilbyspaceclone
|
dc4aa42525
|
Update magweapon_energy.dm
|
2019-05-05 06:35:32 -04:00 |
|
|
kevinz000
|
0bfac54070
|
Update magweapon_energy.dm
|
2019-05-04 23:16:27 -07:00 |
|
|
Fermi
|
b71bc7d9dc
|
Added happiness, psicodine, neurine and 2/6th of MC chem
|
2019-05-04 17:50:43 +01:00 |
|