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
9bd275e430
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-16 13:47:53 -07:00
kevinz000
5d2fb654e8
k
2020-03-16 03:23:09 -07:00
Hatterhat
1fe67d5ce9
a finger of the monkey's paw curls.
2020-03-16 01:35:47 -05:00
Hatterhat
802d37a399
borgs should be outclassed lategame and not hunt
2020-03-15 15:55:31 -05:00
kevinz000
2113b63428
o boy
2020-03-14 21:42:23 -07:00
Trilbyspaceclone
6993dfde2a
Now stocked at your local robotics
2020-03-13 18:29:46 -04:00
Putnam3145
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
Ghommie
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
Ghommie
ee1eea8874
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-09 04:01:23 +01:00
kevinz000
b6431b0ef6
changes
2020-03-03 20:54:53 -07:00
kevinz000
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
Ghommie
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
Ghommie
f2b04be561
More Runtimenator fixes.
2020-01-25 02:16:45 +01:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
kevinz000
9ef4cbfa76
refactor tags
2020-01-16 20:58:00 -07:00
kevinz000
b22e1a1cb4
compile
2020-01-16 02:27:35 -07:00
kevinz000
1acac87da3
compile
2020-01-15 23:54:30 -07:00
Hatterhat
83f8e42fb3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046
2020-01-12 12:37:19 -06:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Hatterhat
0773f1b7fa
sweet merciful FUCK what is this merge
2020-01-12 02:53:30 -06:00
BlackMajor
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
kevinz000
f1a4956afc
easier for me to type
2020-01-10 13:26:34 -08:00
kevinz000
24c1baddd0
compile compile compile
2020-01-10 05:50:19 -08:00
Ghommie
825b4f01c2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-10 02:26:19 +01:00
Hatterhat
04aa0eda5a
tg 40046, 41695, 46726 - hope i didnt forget smth
2020-01-09 18:35:13 -06:00
kevinz000
5b2c4deaa0
lockcharge --> locked_down
2020-01-07 12:04:41 -08:00
BlackMajor
5a97259ba9
Fix a couple of bugs, add wrapping paper and destination tagger
2020-01-07 15:33:16 +13:00
kevinz000
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
BlackMajor
a4d2ea0281
Small fix
2020-01-03 22:39:58 +13:00
Ghommie
4d06d231f8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-02 17:49:01 +01:00
BlackMajor
08d042901c
thank you github
2020-01-02 22:16:47 +13:00
BlackMajor
aabb39a364
Revert "Merge branch 'master' into Yeehaw"
...
This reverts commit 30e3edaac162c8fce043
2020-01-02 22:06:31 +13:00
BlackMajor
30e3edaac1
Merge branch 'master' into Yeehaw
2020-01-02 22:03:58 +13:00
BlackMajor
3239acf74d
Sync
2020-01-02 22:02:55 +13:00
BlackMajor
8085022d97
Couple of changes. Starting on the point bank.
2019-12-31 23:28:30 +13:00
BlackMajor
8948e0491e
add mining card
2019-12-30 02:07:49 +13:00
BlackMajor
b811d3e57e
More work on it
2019-12-30 01:23:41 +13:00
BlackMajor
375e59a77d
Merge branch 'master' into Yeehaw
2019-12-29 22:12:40 +13:00
BlackMajor
2e03a529bf
checking off the list
2019-12-29 22:11:10 +13:00
BlackMajor
206a5e168a
More mining changes
2019-12-29 20:15:49 +13:00
BlackMajor
4e1a9b83cf
Pushing work for tonight.
2019-12-28 01:01:26 +13:00
Ghommie
e1949b0131
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-23 19:02:20 +01:00
Ghommie
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
Ghommie
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
kevinz000
659b78d8b8
Merge pull request #10162 from BlackMajor/Yeehaw
...
Removes medihounds (actually just makes them a medical aux sprite)
2019-12-13 16:52:22 -07:00
nik707
cdeb4733aa
Merge pull request #9863 from BlackMajor/Yote
...
No adrenals for borgs please
2019-12-12 23:50:34 -06:00
BlackMajor
83a707ee93
Removes medihounds, same treatment as janihounds
2019-12-13 13:48:22 +13:00
