Commit Graph

4068 Commits

Author SHA1 Message Date
Ghom
b96475d5aa Merge pull request #11346 from Citadel-Station-13/kevinz000-patch-15
/carbons now null out hand_bodyparts on Destroy()
2020-03-08 01:40:43 +01:00
kevinz000
7115c96f9d Merge branch 'master' into gc_debugging 2020-03-07 15:30:47 -08:00
Ghom
f35dfeb472 Merge pull request #11193 from Trilbyspaceclone/patch-293
Makes two new legion drops
2020-03-07 11:39:51 +01:00
Ghom
aed0efb117 Merge pull request #11343 from Citadel-Station-13/kevinz000-patch-7
mobs now clear LAssailent and movespeed modification on Destroy() (alt name i hate xenobiology)
2020-03-07 11:36:37 +01:00
Ghom
fdf3dc82e4 Merge pull request #11347 from Citadel-Station-13/kevinz000-patch-17
Makes xenobiology powergamers slightly less horrible for the server by caching slime mutation lists
2020-03-07 11:36:06 +01:00
kevinz000
02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
2020-03-07 03:26:48 -07:00
kevinz000
204311abad Update code/modules/mob/living/living.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-07 01:06:24 -07:00
Ghom
bc981bd637 Update hivelord.dm 2020-03-06 21:55:43 +01:00
kevinz000
a669e87db1 Merge branch 'master' into gc_debugging 2020-03-06 10:14:19 -07:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
Kraseo
ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
kevinz000
62d2acf94f Update slime.dm 2020-03-06 02:06:42 -07:00
kevinz000
87c869a735 Update carbon.dm 2020-03-06 02:00:19 -07:00
kevinz000
4d9c92c317 Update mob.dm 2020-03-06 01:39:16 -07:00
kevinz000
ae97cec8b4 Merge pull request #11309 from Citadel-Station-13/Ghommie-patch-1
The lavaland elite tumor shard revival now fetches the mob's ghost.
2020-03-06 00:20:18 -07:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
kevinz000
5bca5690c4 ok 2020-03-05 01:00:35 -07:00
kevinz000
b718e0e0d6 fuck 2020-03-04 16:46:09 -07:00
Ghom
c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
2020-03-04 23:40:54 +01:00
Lin
1a1e362e80 Merge pull request #11310 from Citadel-Station-13/Ghommie-patch-2
Fixing mob holders inventory slot flags (ergo they are not glasses)
2020-03-04 13:29:13 -06:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
kevinz000
7291417244 fix 2020-03-03 20:57:03 -07:00
kevinz000
f8187d0fbf optimize move under living 2020-03-03 20:51:50 -07:00
kevinz000
334f1cc1cf linzolle 2020-03-03 20:48:39 -07:00
kevinz000
1d198aca88 CHECK_MOBILITY 2020-03-03 20:41:08 -07:00
Lin
622a060857 use defines 2020-03-03 20:22:57 +00:00
Lin
6e4a22f4fe fix boop 2020-03-03 20:18:08 +00:00
Ghom
107a6434fd Merge pull request #11305 from Citadel-Station-13/kevinz000-patch-23
you can no longer stamcrit a goddamn xenomorph come on citadel why is this a thing
2020-03-03 13:36:52 +01:00
Ghom
81bb6978de Merge pull request #11250 from Seris02/risingbassnerf
Rising bass nerfs and fixes
2020-03-03 13:26:19 +01:00
Ghom
6da3cf3bbb Merge pull request #11299 from Citadel-Station-13/Linzolle-patch-1
fix flypeople nutrition
2020-03-03 13:24:32 +01:00
Seris02
8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000
c21bd60929 fix 2020-03-03 03:04:23 -07:00
kevinz000
c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
Ghom
bee392257e Update monkey.dm 2020-03-02 23:02:16 +01:00
Ghom
99841c9447 Update pai_shell.dm 2020-03-02 23:00:41 +01:00
Ghom
aa1f9a3695 Update _drone.dm 2020-03-02 22:59:00 +01:00
Ghom
15fed0386c Update lizard.dm 2020-03-02 22:56:15 +01:00
Ghom
6f74d2a188 Update elite.dm 2020-03-02 22:34:29 +01:00
kevinz000
6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
Kraseo
50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Ghom
782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19
Pushing stuff now checks for Process_Spacemove on the automatic step
2020-03-02 16:34:18 +01:00
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
Kraseo
e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die 2020-03-02 11:47:44 +01:00
kevinz000
7ade79ce80 small fix 2020-03-02 03:05:51 -07:00