kevinz000
46823a127b
Merge pull request #11335 from Ghommie/Ghommie-cit604
...
Made flavor texts into an element datum, appliable to every atom.
2020-03-10 17:26:20 -07:00
Ghom
424a3d9668
Merge pull request #11399 from Seris02/lizardtailfixes
...
normalising wagging tail names for a very specific bug fix
2020-03-10 16:59:55 +01:00
kevinz000
3d6c82cbc8
Merge pull request #11381 from Citadel-Station-13/Ghommie-patch-2
...
Something about layers.
2020-03-10 05:59:36 -07:00
Ghommie
0587d3482d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604
2020-03-09 21:53:22 +01:00
Seris02
68382d65c8
normalising wagging tail names
2020-03-09 17:48:12 +08:00
Ghommie
ee1eea8874
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-09 04:01:23 +01:00
Ghom
8878733fc1
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
...
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
Ghom
038f37d309
Something about layers.
2020-03-08 05:10:03 +01:00
Putnam
ddd4d14477
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into eigenstasium-nope
2020-03-06 22:57:12 -08:00
Putnam
c221135849
eigenstasium no longer encourages certain personalities
2020-03-06 14:58:33 -08:00
Ghom
65b7833738
Merge pull request #11336 from Putnam3145/mkultra-aaa
...
Makes MKUltra's explosion no longer spread prefbreak gas
2020-03-06 21:47:14 +01:00
kevinz000
9420424c8f
Merge pull request #11332 from Ghommie/Ghommie-cit603
...
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
deathride58
e08669e8a1
Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts
2020-03-06 00:15:37 -05:00
deathride58
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Putnam
658489a15a
no this is how you do it.
2020-03-05 11:26:42 -08:00
Putnam
52045a659b
Made MKUltra use the default explosion.
2020-03-05 11:15:54 -08:00
Ghommie
2cbdae2f0a
Made flavor texts into an element datum.
2020-03-05 18:46:33 +01:00
Ghommie
bb7bfc04cc
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-05 01:47:04 +01:00
Ghom
5e4f8dc6a0
Merge pull request #11181 from Detective-Google/big-chode-energy
...
changes sausage girth from circumference -> diameter
2020-03-04 23:49:58 +01:00
deathride58
519de6a83d
while im at it - Improves the appearance of the antenna synth antenna by slimming down the south-facing and north-facing side of the synth head sprite and moving the antennae closer together by one pixel
2020-03-03 16:12:33 -05:00
deathride58
560192c45a
Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate
2020-03-03 15:49:25 -05:00
kevinz000
8ef68fa36b
En garde!
2020-02-28 13:35:41 -07:00
kevinz000
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
kevinz000
67c857292f
Aa
2020-02-27 20:09:33 -07:00
kevinz000
9bd4719c0a
wrong type
2020-02-27 20:09:29 -07:00
kevinz000
995aa6cdec
fix
2020-02-27 20:07:34 -07:00
kevinz000
045d5b2dbf
fixes
2020-02-27 20:06:52 -07:00
Detective-Google
1f88a22d04
Merge branch 'master' into big-chode-energy
2020-02-27 16:39:57 -06:00
Detective Google
b7aad30d3c
girth -> diameter
2020-02-27 16:38:14 -06:00
YakumoChen
3914c5522a
TWOCAT
2020-02-24 05:33:40 -05:00
YakumoChen
495db5f09f
OH GOD CATSPLOSIONN
2020-02-24 05:18:36 -05:00
YakumoChen
b7fd779f18
OH GOD CATSPLOSION
2020-02-24 04:59:52 -05:00
kevinz000
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
Ghom
f94f997cc2
Merge pull request #11080 from kevinz000/surubatons
...
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
2020-02-20 11:09:46 +01:00
kevinz000
34fbcd1dc0
fixes
2020-02-19 07:49:05 -07:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Ghommie
1a0fba8a2a
Something about consistency and magnetic rifles.
2020-02-16 18:37:51 +01:00
kevinz000
f79148d549
Merge pull request #10947 from Ghommie/Ghommie-cit563
...
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
kevinz000
b9e8be5784
Merge pull request #10940 from Ghommie/Ghommie-cit560
...
First tweak to cargo reagents selling.
2020-02-15 12:15:50 -07:00
kevinz000
b705e2fe37
Merge pull request #11069 from Ghommie/Ghommie-cit575
...
Fixing some privates overlays
2020-02-15 11:46:18 -07:00
Microvolnovka19
3f9965a781
Some sprite fixes ( #11089 )
...
* Delete penis_onmob.dmi
* Some sprite fixes
* Delete penis_onmob.dmi
* This should be ok
* Delete penis_onmob.dmi
* This should be ok?
* Delete penis_onmob.dmi
* This totally should be ok
2020-02-15 11:30:00 +01:00
Ghom
ad639d5f2f
Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7
...
!tgs valentine
2020-02-15 09:04:29 +01:00
Ghommie
4a621fb1aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
2020-02-14 19:39:53 +01:00
Ghom
2654843862
Merge pull request #11063 from Zellular/Animations1
...
Minor Pupdozer fix
2020-02-14 19:20:58 +01:00
kevinz000
0861179a79
Update chat_commands.dm
2020-02-13 20:34:48 -07:00
kevinz000
b3a81d9c8e
ok
2020-02-13 15:59:58 -07:00
Ghommie
a0dc21b01c
ok.
2020-02-13 12:50:08 +01:00
Ghommie
b8cebf8953
Fixing some privates overlays
2020-02-13 12:41:36 +01:00