kevinz000
bd7b1b1193
fixes
2020-04-30 01:23:21 -07:00
Ghom
5ccdc55e42
Merge pull request #11979 from kevinz000/magnetic_harness
...
Cybernetic arm implant balance pass (namely: shields)
2020-04-25 02:47:28 +02:00
Lin
7f271157c3
Merge pull request #11929 from Ghommie/Ghommie-cit692
...
Shielded Component
2020-04-22 20:33:12 +00:00
kevinz000
c551006295
catch dropped
2020-04-22 10:54:42 -07:00
Ghommie
e3fb978465
Shielded element.
2020-04-19 01:48:51 +02:00
Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
Ghom
49e36e47ff
Merge pull request #11809 from kevinz000/storage_rework
...
Adds baystation-style volumetric space storage support
2020-04-14 13:17:11 +02:00
Ghommie
616d482cf6
Deleting poly clothes copypasta.
2020-04-13 22:51:46 +02:00
Ghommie
db43f53ac4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 16:15:40 +02:00
Ghommie
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
Ghommie
31e0321808
Minor action datum refactor and spellcasting fix.
2020-04-11 16:53:08 +02:00
Artur
f481be1496
Makin stuff nice and dandy
2020-04-10 20:53:28 +03:00
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
kevinz000
7ec669ecd4
bet
2020-04-07 16:11:58 -07:00
Lin
8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
kevinz000
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
Putnam3145
658701bf37
Various ghost role QoL; moving holding facility; removing energy net ( #11676 )
...
* Removed gay baby jail net from ninja
* Made a proper holding facility for syndicate contractors
* Made ghost role eligibility able to allow reghosting.
* Added a medibot to the holding facility.
* Added new comsigs to every other ghost proc
* Properly dummied out capture objective
2020-03-31 22:04:55 +02:00
Lin
76e4d0e0db
Merge pull request #11622 from Ghommie/Ghommie-cit643
...
Antags such as wizard and nuke ops are now flavorless. Also closet megafauna fix.
2020-03-26 18:06:50 -05:00
Ghommie
36d5d5e141
Antagonists such as wizard and nuke ops are now more anonymous.
2020-03-25 23:33:50 +01:00
Ghommie
54cdae148d
Removes uncompiled flightsuit code leftovers and bad hooks.
2020-03-24 20:28:13 +01:00
Ghommie
2045fb86f6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
2020-03-21 21:41:34 +01:00
kevinz000
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
kevinz000
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
kevinz000
e3301f8722
bet
2020-03-16 10:44:02 -07:00
Ghommie
f93445aa31
.yeH
2020-03-15 22:46:32 +01:00
Ghommie
15e2cb9cde
Hey.
2020-03-15 22:45:05 +01:00
Ghommie
1fc62b9e99
split flags from signals.
2020-03-15 22:43:58 +01:00
Ghommie
ea30b2fb1a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
2020-03-15 22:35:59 +01:00
kevinz000
2113b63428
o boy
2020-03-14 21:42:23 -07:00
Ghommie
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00