shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

127 Commits

Author SHA1 Message Date
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
silicons
98ff06fa1a the roasted roasted roasted roasted roasted roasted roasted roasted......... (#14850) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-06-21 17:54:56 +02:00
silicons
01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
zerothebigboy
53e95b7356 theseventeenthofmany 2021-06-11 19:48:04 -04:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons
275b532a8c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-04-26 14:17:43 -07:00
silicons
a62d942bee telescopic batons now have a message when being toggled. you can now threateningly point extended telebatons at people. (#14580) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-04-13 10:22:01 +02:00
silicons
02b52e6142 framework 2021-03-20 16:02:26 -07:00
silicons
5d51025ad6 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-03-15 14:39:16 -07:00
silicons
e43838739d changes 2021-02-28 00:37:39 -07:00
silicons
70c828f74d changes 2021-02-28 00:27:14 -07:00
kiwedespars
de69e9996a nerfs cqc 2021-02-21 13:10:08 -08:00
silicons
1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Putnam
6028c66ceb Fixed the combat log issue 2020-08-30 08:26:29 -07:00
Putnam
4cf040a11a Makes plastitanium rapier not silently poison for pacifists. 2020-08-30 06:25:00 -07:00
silicons
de3227e3e0 fix 2020-08-04 22:55:33 -07:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons
2a29f73ac8 ok 2020-07-25 17:34:12 -07:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
kevinz000
34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000
1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000
e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000
f8741b6a0b adjust 2020-05-29 19:50:11 -07:00
kevinz000
18bef15afc captain rapier 2020-05-29 02:36:13 -07:00
kevinz000
e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
kevinz000
95c6c7345c implementations 2020-05-24 14:56:01 -07:00
Ghommie
ffd5dd9615 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732 2020-05-08 19:01:28 +02:00
Ghommie
a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
Ghommie
001109cfcd About ready. 2020-05-05 20:58:44 +02:00
Ghommie
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02: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
761b4a2152 compile 2020-03-20 23:13:01 -07:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
necromanceranne
570f6e8a66 Plastitanium Rapier: Sleepy Edition (#11507) 
* knockout rapier, improved sprites

* it's a rapier not a foil those aren't synonyms

* whoops

* needs it's shanking sound

* Put a stamina loss threshold onto the swords slep so you need at least two hits to proc the sleep. Don't get stabbed more than once!

* Update items_and_weapons.dmi

* Removes chat spam and also frankly it doesn't need drowzy on top
 2020-03-20 16:07:04 +01:00
kevinz000
7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000
703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000
9ead492bb0 changes 2020-03-16 00:28:18 -07:00
kevinz000
4d0677daa9 s 2020-03-14 21:48:23 -07:00
kevinz000
2113b63428 o boy 2020-03-14 21:42:23 -07:00
Ghom
1c5aa2f933 Merge pull request #11377 from Kraseo/contractor-fixes 
Some contractor adjustments & fixes
 2020-03-09 00:26:54 +01:00