Commit Graph

13122 Commits

Author SHA1 Message Date
Ghommie
60c7268e37 Also fixing bloodsucker coffins. 2020-03-04 16:29:09 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
Ghom
0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3
reagent logging pr attempt 3 but it works
2020-03-03 21:27:17 +01: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
Ghom
294668d6e1 Merge pull request #11300 from kappa-sama/patch-11
removes obsolete laptop slowdown
2020-03-03 13:24:15 +01:00
Ghom
c7fe9d31e2 Merge pull request #11311 from Citadel-Station-13/kevinz000-patch-19
*HELPS* with the atrocious GC situation regarding blobs
2020-03-03 13:23:28 +01:00
Seris02
8c4c2842d0 fixes and code improvements 2020-03-03 19:27:09 +08:00
kevinz000
c3913a793a Update carbon_movement.dm 2020-03-03 03:02:16 -07:00
kevinz000
49939b0973 Update overmind.dm 2020-03-02 18:15:18 -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
c984cd7677 Merge pull request #11270 from ancientpower/paramedic-tweaks
Paramedic tweaks (sprites/access/stuff for future use)
2020-03-02 22:46:49 +01:00
kevinz000
6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
Ghom
00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap
Proper supermatter tweaks
2020-03-02 16:36:58 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
2020-03-02 16:36:22 +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
Ghom
4ed92ff03a Merge pull request #11283 from Trilbyspaceclone/patch-299
Makes most winter coats and hoods have their own desc
2020-03-02 16:18:47 +01:00
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
kappa-sama
ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00
Lin
bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
Ghom
28c2d27860 Merge pull request #11287 from monster860/patch-1
Allow moaning while in soft crit
2020-03-02 00:13:27 +01:00
Putnam
aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Ghommie
c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
Arturlang
97c5aa1e24 Maintainer suggestions
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-01 16:48:49 +02:00
Ghom
20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp
ongoing vampire ability balance/rework attempt
2020-03-01 14:39:03 +01:00
raspyosu
d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
Trilbyspaceclone
cdd97e8547 she 2020-03-01 00:12:45 -05:00
Trilbyspaceclone
e2b706961a Turns out this is Rag's PR and not mine
Neet

Co-Authored-By: Ragolution <bloodlust3333@gmail.com>
2020-03-01 00:11:32 -05:00
monster860
899f1bbd88 Allow moaning while in soft crit 2020-02-29 21:02:37 -05:00
Ghom
609dc0e792 Merge pull request #11242 from Kraseo/green-thumb
Adds reagent traits to Lavaland flora + a botany QOL change
2020-02-29 23:03:53 +01:00
Ghom
295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter
Gave jittering to salbutamol
2020-02-29 20:42:03 +01:00
Trilbyspaceclone
3c9d592b8a Update miscellaneous.dm 2020-02-29 09:51:40 -05:00
ancientpower
f44908dc2e forgot icon state changes 2020-02-29 02:03:25 -06:00
ancientpower
5c5ec541ae Merge branch 'master' into paramedic-tweaks 2020-02-29 01:55:46 -06:00
ancientpower
f48e56fe44 thanks mapdiffbot 2020-02-29 01:49:42 -06:00
ancientpower
c4113824f7 more fixes 2020-02-29 01:47:19 -06:00
Lin
70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
Lin
5ba6320f5e Merge pull request #11261 from Ghommie/Ghommie-cit591
Fixing escaped characters in flavor texts.
2020-02-29 00:12:35 -06:00
Lin
a3eef43445 Merge pull request #11263 from Citadel-Station-13/Ghommie-patch-3
Removes extra unwarranted paramedic access.
2020-02-29 00:11:16 -06:00
kevinz000
c5edeb9913 Merge pull request #11265 from Citadel-Station-13/Ghommie-patch-4
Cogchamp mixing sound made less annoyingly long.
2020-02-28 12:41:05 -07:00
raspyosu
5b6da0b350 ok
changes that artur suggested guess it makes no sense to add too much flavor
2020-02-28 13:29:36 -05:00
ancientpower
ed320046c5 fixes icons 2020-02-28 11:42:15 -06:00
kevinz000
e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000
d0eebdbb02 Merge pull request #11273 from Arturlang/blob_broacast_exploit
[s] Fixes blob broadcast HTML Injection.
2020-02-28 04:28:41 -07:00
Artur
c6fcffe949 Made the same mistake... 2020-02-28 13:19:27 +02:00
Artur
d6e402aa5d Damned 2020-02-28 13:06:28 +02:00
kevinz000
a2970b5746 Update living.dm 2020-02-28 02:40:51 -07:00
ancientpower
23c3e5b328 tweaks for the tweaks 2020-02-28 00:17:28 -06:00