Commit Graph

13393 Commits

Author SHA1 Message Date
Ghom
edc53770ea Update area_copy.dm 2020-03-03 15:05:32 +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
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
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
Kraseo
4315a4d1b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 23:06:29 +01: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
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
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
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
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
Trilbyspaceclone
da48f95de7 Update hud.dm 2020-03-02 00:11:54 -05: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
Kraseo
648f7793d3 proving to the world i'm retarded one commit line at a time 2020-03-01 23:56:34 +01:00
Kraseo
ad8013d839 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-01 23:39:16 +01:00
Putnam
aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
Kraseo
5da4e5fbcd parte 5: tgui and javascript torture 2020-03-01 22:57:39 +01:00
Kraseo
e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Kraseo
ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo
d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo
38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01: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
Trilbyspaceclone
684b7714db Update hud.dm 2020-03-01 08:21:25 -05:00
TrilbySpaceClone
51c675603e ??? 2020-03-01 02:48:13 -05: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