Commit Graph

13604 Commits

Author SHA1 Message Date
Ghom
c373323690 Merge pull request #11318 from Citadel-Station-13/Linzolle-patch-1
fix nose booping
2020-03-04 23:40:54 +01:00
Ghom
9eedf8c1fb Update blob_mobs.dm 2020-03-04 23:34:59 +01:00
Ghom
ec5449b349 Merge pull request #11327 from Arturlang/dropper_fix
Fixes reagent containers transfer cycling
2020-03-04 23:17:00 +01:00
Ghom
17488480b1 Allows blobbernauts to drag objects (but not mobs) again. 2020-03-04 22:43:30 +01:00
TrilbySpaceClone
7e51cf9ab3 Removed unused techweb var 2020-03-04 16:30:10 -05:00
Artur
f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02: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
Trilbyspaceclone
1c310f6cee Update hardsuit.dm 2020-03-04 13:01:25 -05:00
Ghom
7a2e0892d3 Merge pull request #11277 from kevinz000/sword_point
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
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
Kraseo
edfe50579e ACTUALLY fixes null runtimes + double contracts 2020-03-04 13:17:24 +01:00
kevinz000
8923b7e72d minimaps 2020-03-04 01:21:16 -07:00
BlackMajor
43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13: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
Putnam
3059e48278 Removed 30TC thing from martyr/hijack 2020-03-03 16:46:41 -08:00
Ghom
284ef326c7 Stops ninjas employed by syndies from receiving friendly flavor objectives. 2020-03-04 00:36:18 +01:00
deathride58
49ad376e5e Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this. 2020-03-03 17:44:10 -05:00
deathride58
560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate 2020-03-03 15:49:25 -05: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
Lin
622a060857 use defines 2020-03-03 20:22:57 +00:00
Lin
6e4a22f4fe fix boop 2020-03-03 20:18:08 +00:00
deathride58
9efdad1d6b Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome. 2020-03-03 13:55:33 -05:00
Ghom
beef891789 Update area_copy.dm 2020-03-03 15:12:54 +01:00
Ghom
490ad4373d Update area_copy.dm 2020-03-03 15:12:06 +01:00
Ghom
b378da2468 Update energy.dm 2020-03-03 15:06:42 +01:00
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