silicons
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
Timothy Teakettle
0bf9553eca
hmm
2020-08-02 19:13:39 +01:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
Ghommie
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
Timothy Teakettle
eba1e8f301
fixes the merge conflicts
2020-06-15 23:29:49 +01:00
Ghom and GitHub
7513e032e3
petrification improvements ( #12375 )
...
* petrification improvements
* Standards.
2020-06-14 23:04:12 -07:00
kevinz000
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
Ghom and GitHub
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
kevinz000
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
Arturlang and GitHub
32135cc008
Makes bloodsuckers unguttable and undecappable ( #12335 )
...
* Bloodsuckers cant be gutted or beheaded anymore
* Mistakes were made
2020-05-24 13:08:18 -07:00
Ghom and GitHub
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
Ghom and GitHub
12ac08d7c5
Porting tesla/electrocute code updates. ( #12280 )
...
* Porting tesla/electrocute code updates.
* Why is the dominator being insta-deleted by zaps a good idea?
* Yikes.
* ah
2020-05-17 16:35:17 -07:00
kevinz000
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
Kraseo
c79ece7449
really surprised this wasn't done earlier
2020-05-04 18:30:27 +02:00
kevinz000 and GitHub
af08e0fecf
Merge pull request #11984 from Hatterhat/fastpump
...
The Neo-Russian Rifleman's Primer - a book that makes you pump shotguns and work rifle bolts faster
2020-04-25 17:07:29 -07:00
Ghommie
e17c51a85d
Porting some VV updates from tg.
2020-04-25 00:49:51 +02:00
Hatterhat
c686ed193b
a book about mashing Z and LMB
2020-04-22 17:55:11 -05:00
Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
kevinz000
3c4c397c46
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-04-08 04:04:45 -07:00
necromanceranne and GitHub
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
necromanceranne
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
Artur
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
Artur
4de14fbdf7
Finnishing touches
2020-04-01 12:59:06 +03:00
6e140f003c
cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside ( #11691 )
...
* Update cloning.dm
* Update traits.dm
* Update life.dm
* Update code/__DEFINES/traits.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-30 23:24:51 +02:00
Ghommie
f7ce5e5de3
infiltrator sneaky shoes fix.
2020-03-27 14:42:23 +01:00
kevinz000
289d581e66
ok bet
2020-03-26 12:19:09 -07:00
0e3193e929
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important ( #11376 )
...
* combat refactoring
* i hate this
* mobility flags part 2 time xd
* whew
* stuff
* a
* ok
* changes
* Wew
* k
* add flags
* FUCKYOUVORE
* fixes
* typo
* no using this in hard stamcrit
* update icon
* woopsy
* . = ..()
* sigh
* Update living_combat.dm
* wew
* wups
* fix
* i hate you
* wrong button
* k
* ok
* bet
* k
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* early returns
* skreee
* agony
* k
* k
* k
* k
* wack
* compile
* wack
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-21 16:04:26 +01:00
ZeroMan
93b1ade0bc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
...
# Conflicts:
# code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
ZeroMan
35a4d71a54
im sorry little one
2020-03-19 21:59:14 -04:00
kevinz000 and GitHub
8b0600a7fa
Merge pull request #11527 from Ghommie/Ghommie-cit628
...
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
Seris02 and GitHub
ea8941343e
stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) ( #11520 )
...
* yeet gone
* pfft oof
* oof
2020-03-19 13:40:11 +01:00
Ghommie
32975bf509
More bug reports yee'd their last haw.
2020-03-18 23:43:23 +01:00
kevinz000 and GitHub
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
necromanceranne
e0df350579
PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals.
2020-03-10 23:21:59 +11:00
Seris02
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
Seris02
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
kevinz000
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
Ghom and GitHub
e92183e968
Merge pull request #10541 from Detective-Google/the-p-o-o-l
...
adds the POOL to box station
2020-02-21 02:43:04 +01:00
kevinz000
4a537d770d
let's make this work
2020-02-19 07:20:16 -07:00
kevinz000
950082f537
k
2020-02-18 20:49:42 -07:00
kevinz000
0229db9c61
trait comsigs
2020-02-18 18:23:01 -07:00
Seris02
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Artur
a9a167b9d3
Suffering and co
2020-02-11 20:18:32 +02:00
Detective Google
f145b8c0b5
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
2020-02-07 16:28:47 -06:00
Seris02
4ec99a38e2
merge fixes
2020-02-07 15:28:05 +08:00
kevinz000 and GitHub
73aa761c69
Merge pull request #10700 from Ghommie/Ghommie-cit526
...
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
Seris02
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
silicons