Timothy Teakettle
7fbfb4ad0e
Merge remote-tracking branch 'upstream/master' into embed-changes
2020-06-15 22:48:26 +01:00
Timothy Teakettle
4c55e86da7
part 2
2020-06-10 23:14:25 +01:00
kevinz000
433bd1af79
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-27 18:11:15 -07:00
Ghommie
841bb86181
Fixing blindness stuff.
2020-05-25 16:10:25 +02:00
kevinz000
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
Ghom and GitHub
9eccef2836
Porting "Personal interaction messages to simple animals" and more. ( #12268 )
...
* Porting "Personal interaction messages to simple animals" and more.
* Travis check.
* doc
* whoopsie.
* )
2020-05-18 04:46:57 -07:00
Ghom and GitHub
75dec8ce2c
Ports "Removes the absolute istype fest from footsteps" ( #12259 )
...
* Ports "Removes the absolute istype fest from footsteps"
* Update species.dm
2020-05-18 04:46:22 -07:00
Lin and GitHub
0d92783a91
oops. ( #12242 )
2020-05-14 00:22:57 +02:00
Lin and GitHub
fd30edca9c
infinixeno ( #12234 )
2020-05-13 03:18:25 +02:00
Ghommie
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
kevinz000
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
Lin and GitHub
19f89ed1ba
Merge pull request #12022 from Ghommie/Ghommie-cit711
...
organ/on_life tweaks.
2020-04-29 01:15:02 +00:00
Ghom and GitHub
858c697acc
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
...
Xenomorph balancing pass
2020-04-26 14:03:15 +02:00
Ghommie
8440b48a9a
organ/on_life tweaks.
2020-04-25 16:19:43 +02:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
kevinz000
5984fa02b8
more changes
2020-04-22 08:49:21 -07:00
kevinz000
d259519bff
changes
2020-04-22 08:31:09 -07:00
kevinz000
0eac988f52
okay!
2020-04-22 08:22:52 -07:00
Ghom and GitHub
bceca18626
Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
...
you can no longer knock out xenomorphs by punching them in the face i guess
2020-04-16 19:04:16 +02:00
Linzolle
39e6541ccd
remove bad words
2020-04-14 17:54:07 -05:00
Linzolle
f828f4c4b7
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
kevinz000 and GitHub
d6544af144
Update status_procs.dm
2020-04-12 22:25:46 -07:00
Ghommie
31e0321808
Minor action datum refactor and spellcasting fix.
2020-04-11 16:53:08 +02:00
ForrestWick
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
kevinz000
4391fc3714
pixel shifting
2020-03-26 12:51:17 -07:00
Artur
fdc6a02eea
Hm
2020-03-25 12:46:42 +02:00
Artur
9bb7529a49
Progress
2020-03-24 16:55:46 +02:00
Artur
c6a8515297
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-24 12:36:21 +02:00
kevinz000
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -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
kevinz000
c14b1c2857
linter
2020-03-16 14:18:47 -07:00
kevinz000
a77be038b8
refactoring this whole thing again
2020-03-16 04:56:32 -07:00
kevinz000
2113b63428
o boy
2020-03-14 21:42:23 -07:00
kevinz000 and GitHub
c4f59b0b83
Update life.dm
2020-03-10 17:18:01 -07:00
kevinz000
6354b48659
fix
2020-03-03 20:58:06 -07:00
kevinz000
7291417244
fix
2020-03-03 20:57:03 -07:00
kevinz000
1d198aca88
CHECK_MOBILITY
2020-03-03 20:41:08 -07:00
kevinz000 and GitHub
6c8154e8e1
Update damage_procs.dm
2020-03-02 12:13:36 -07:00
kevinz000 and GitHub
1a87a9d051
Update damage_procs.dm
2020-03-02 07:24:02 -07:00
Artur
74d6473c3b
Initial Commit
...
Changes isvamp() to isbloodsucker(), adds a isvampire() check for the race itself, reworks regen cores codewise, adds a defib check for bloodsuckers
2020-02-25 17:07:40 +02:00
kevinz000
424eb48d9e
fixes
2020-02-24 01:59:45 -07:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Ghom and GitHub
402283e86a
Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
...
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
kevinz000
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
kevinz000 and GitHub
275b1f73e0
Merge pull request #10849 from Ghommie/Ghommie-cit547
...
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
Ghommie
8de11845d5
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00
Ghommie
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
Artur
1bf2a3e7ca
Initial Commit
2020-01-30 17:28:02 +01:00
kevinz000
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
Timothy Teakettle