Poojawa
|
e4ba220eb7
|
oh god, oh fuck. why
|
2019-05-16 14:10:31 -05: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 |
|
kevinz000
|
90c3e4b776
|
Merge pull request #8322 from Trilbyspaceclone/patch-117
Buffs mag-gun recharges speed
|
2019-05-11 22:18:29 -07:00 |
|
BurgerLua
|
6df27ef2a3
|
Updated integrated circuits
|
2019-05-09 15:25:48 -07: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 |
|
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 |
|
BurgerLua
|
1557c33008
|
Adds Penis Enlargement Pills
|
2019-05-02 14:55:04 -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 |
|
kevinz000
|
cbc0607086
|
Merge pull request #8290 from Trilbyspaceclone/Laser_gun_adv
Readds Laser carbines.
|
2019-04-30 05:31:33 -07:00 |
|
kevinz000
|
709e3375ac
|
Merge pull request #8283 from BurgerLUA/NoMoreOfThisShit
Adds a new trait that makes you immune* to Crocin and Hexacrocin
|
2019-04-30 05:28:55 -07:00 |
|
kevinz000
|
218fd09102
|
Merge pull request #8301 from Trilbyspaceclone/hell
[Ready] Mag gun rework MK II
|
2019-04-30 05:24:16 -07:00 |
|
Poojawa
|
72751a9efc
|
Sorts and cleans up some sprites
adds guilmon things to lizards as well, since they didn't have it I guess
|
2019-04-29 04:33:23 -05:00 |
|
Trilbyspaceclone
|
60a9544a6b
|
Update magweapon_energy.dm
|
2019-04-29 00:19:47 -04:00 |
|
Trilbyspaceclone
|
4492e60a9f
|
typo
|
2019-04-29 00:02:53 -04:00 |
|
Trilbyspaceclone
|
5430454c73
|
Update magweapon.dm
|
2019-04-28 23:59:29 -04:00 |
|
Trilbyspaceclone
|
d136d95743
|
Update magweapon.dm
|
2019-04-28 23:56:39 -04:00 |
|
Trilbyspaceclone
|
b51751dfa8
|
Update magweapon_energy.dm
|
2019-04-28 23:38:34 -04:00 |
|
Trilbyspaceclone
|
c5f3f67824
|
Update magweapon.dm
|
2019-04-28 23:33:31 -04:00 |
|
Trilbyspaceclone
|
514e15ee6c
|
Update magweapon.dm
|
2019-04-28 23:32:38 -04:00 |
|
Useroth
|
e51cdf98b2
|
Fixed the calibers up.
|
2019-04-29 04:58:26 +02:00 |
|
Trilbyspaceclone
|
22912832d7
|
Create magweapon_energy.dm
|
2019-04-28 22:46:50 -04:00 |
|
Trilbyspaceclone
|
bc251b59aa
|
Update magweapon.dm
|
2019-04-28 22:43:01 -04:00 |
|
Trilbyspaceclone
|
f6bb8b6aef
|
Update magweapon.dm
|
2019-04-28 22:33:58 -04:00 |
|
Trilbyspaceclone
|
9ff3918ffd
|
Update magweapon.dm
|
2019-04-28 22:25:19 -04:00 |
|
Trilbyspaceclone
|
ad2cacb59e
|
toys
|
2019-04-28 22:05:53 -04:00 |
|
Trilbyspaceclone
|
fb7a129ca5
|
Update magweapon.dm
|
2019-04-28 21:56:48 -04:00 |
|
Trilbyspaceclone
|
3eeafbb975
|
Merge branch 'master' into hell
|
2019-04-28 21:54:55 -04:00 |
|
Trilbyspaceclone
|
bec3cf8967
|
Update magweapon.dm
|
2019-04-28 21:24:45 -04:00 |
|
Trilbyspaceclone
|
0fa3fb6aca
|
Update magweapon.dm
|
2019-04-28 16:46:12 -04:00 |
|
BurgerLua
|
36fc30f7a7
|
fugg
|
2019-04-28 13:39:24 -07:00 |
|
BurgerLua
|
6021e80a8b
|
Update penis.dm
|
2019-04-28 13:23:16 -07:00 |
|
Useroth
|
c59cb823bb
|
Let's try like this.
|
2019-04-28 21:14:11 +02:00 |
|
Trilbyspaceclone
|
b7b4bf1a61
|
Update magweapon.dm
|
2019-04-28 14:51:53 -04:00 |
|
Trilbyspaceclone
|
15a1b2baeb
|
Poojawa pointed this out
|
2019-04-27 18:56:40 -04:00 |
|
BurgerLua
|
1f78520b68
|
Adds a new trait that makes you immune from the "positive" effects of hexacrocin and crocin.
|
2019-04-24 20:13:21 -07:00 |
|
kevinz000
|
a5e750e20f
|
skintone
|
2019-04-23 19:06:00 -07:00 |
|
kevinz000
|
ab090bd2c1
|
Start
|
2019-04-22 21:54:10 -07:00 |
|
kevinz000
|
f38546b21a
|
Merge pull request #8230 from Trilbyspaceclone/patch-97
[Ready] Makes Mentor chat have better colors as not to confuse Mentors from chat vs helping
|
2019-04-20 16:40:09 -07:00 |
|
kevinz000
|
901e748675
|
Merge pull request #8254 from Poojawa/the-great-vore-escape
clears blindness on vore OOC escape
|
2019-04-20 16:31:59 -07:00 |
|
kevinz000
|
60bc278418
|
Merge pull request #8227 from Trilbyspaceclone/patch-96
Magrifle/Magpistol nonlethals now do 2 damage rather than 0
|
2019-04-20 16:30:58 -07:00 |
|
Poojawa
|
1f65b1ebdd
|
clears blindness on vore OOC escape
|
2019-04-17 01:27:08 -05:00 |
|
BurgerLua
|
7ff2b6817b
|
No more seperate whatever
|
2019-04-16 21:06:57 -07:00 |
|
deathride58
|
fdd0eb4b17
|
Update modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm
Co-Authored-By: BurgerLUA <BurgerLUA@users.noreply.github.com>
|
2019-04-16 15:40:55 -07:00 |
|
BurgerLua
|
d49178fd84
|
Removed debug code, made the arousal input just be a flat value.
|
2019-04-16 12:10:03 -07:00 |
|
BurgerLua
|
dba2b6deaf
|
Tweaks Electric Stimulator + Adds Bonermeter
|
2019-04-16 11:55:54 -07:00 |
|
deathride58
|
530e021254
|
Merge pull request #8240 from Poojawa/human-taaaaaaaails
Fixes missing tail wag states
|
2019-04-15 10:01:45 -04:00 |
|
deathride58
|
c6ef9da679
|
Merge pull request #8239 from Citadel-Station-13/kevinz000-patch-36
Virgo hairs are now sorted better
|
2019-04-15 10:01:13 -04:00 |
|