Commit Graph

18433 Commits

Author SHA1 Message Date
variableundefined 2bc50e2c0d Merge pull request #10013 from farie82/Paperplane-runtime
Fixes non humans being able to proc the paper folding
2018-10-27 22:55:59 +08:00
variableundefined cbb7960323 Merge pull request #10011 from lass9030/dummy-vortexes
Runtime with vortexes fix
2018-10-27 22:54:50 +08:00
variableundefined dc30c2e202 Merge pull request #10007 from Certhic/animal-attack
fixes animals attacking while on help intent
2018-10-27 22:52:51 +08:00
joep van der velden e6ef48c39e Bad renault 2018-10-27 16:27:31 +02:00
lass9030 45404f8b93 Runtimes, begone. 2018-10-27 16:16:38 +02:00
Certhic a082e76838 fixes animals attacking while on help intent 2018-10-27 13:52:20 +02:00
variableundefined c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
variableundefined bf7ef076ca Merge pull request #10000 from tigercat2000/literally_catgirls
(TGCRP) - /tg/ catgirl refugee program
2018-10-27 11:00:34 +08:00
variableundefined e8502cb848 Merge pull request #9970 from farie82/Dusting-fix
Dusting a mob now dusts all items held and equiped
2018-10-27 07:26:54 +08:00
variableundefined ada7bdcc64 Merge pull request #9972 from lass9030/species-runtime
Runtime in species.dm
2018-10-27 07:26:28 +08:00
variableundefined 3d784c7903 Merge pull request #9981 from lass9030/stable-ldm
Stable LDM and Sorium fix
2018-10-27 07:25:19 +08:00
lass9030 ea4646e33d fixed it! 2018-10-26 17:50:06 +02:00
variableundefined e5680badc4 Merge pull request #9902 from alex-gh/anonymous_syndieradio
[READY] Syndicate communication channel is now pseudonymous.
2018-10-26 18:59:56 +08:00
lass9030 29a73c7e47 get reagent amount 2018-10-26 11:43:32 +02:00
tigercat2000 1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
tigercat2000 b0c1033d51 Fix humans layering over other objects incorrectly 2018-10-25 16:07:00 -07:00
tigercat2000 0c67ee398a Move lighting to it's own plane, fix observers 2018-10-25 15:48:03 -07:00
tigercat2000 bd744965b0 But legitimately /tg/ icons 2018-10-25 12:58:06 -07:00
Birdtalon 19d805c5f4 changes C to src, removes an unnecessary proc 2018-10-25 18:36:39 +01:00
lass9030 7b790182ee added missing check 2018-10-25 16:29:58 +02:00
joep van der velden d3bfe9e583 Dusting now dusts all items 2018-10-25 16:20:46 +02:00
tigercat2000 8dc88cb80b Closer to working 100% 2018-10-25 01:48:51 -07:00
tigercat2000 1f9fc0a7fb SSoverlays for human icons, mostly works 2018-10-25 01:07:27 -07:00
variableundefined 4889c3a1a5 Merge pull request #9081 from tigercat2000/multivis
PiP Multivis
2018-10-25 09:45:02 +08:00
variableundefined 0e46797cf1 Merge pull request #9963 from farie82/Tablet-fix
Fixed the tablet being spawned with the broken sprite
2018-10-25 07:35:03 +08:00
variableundefined dee8334e28 Merge pull request #9964 from Certhic/borgHeal
fix runtime CureIfHasDisability and borg repair
2018-10-25 07:19:39 +08:00
variableundefined f0535dbcb9 Merge pull request #9958 from dovydas12345/data-disk
Adds data disk to research designs
2018-10-25 07:18:26 +08:00
Certhic 27b0b7939f fixes borg healing 2018-10-25 00:36:42 +02:00
Certhic 10795c9c7a fixes a rejuvenate runtime 2018-10-25 00:10:10 +02:00
joep van der velden 7617275b02 Fixed it 2018-10-24 22:54:14 +02:00
variableundefined 781109e11b Merge pull request #9962 from Birdtalon/reformatting
Reformats assembly.dm and proximity.dm
2018-10-24 21:51:38 +08:00
dovydas12345 a8b0bbae47 Better name and extra requirements! 2018-10-24 14:35:12 +03:00
Birdtalon 941e9b49cf reformats assembly.dm and proximity.dm 2018-10-24 11:24:58 +01:00
Aurorablade 654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
tigercat2000 8ef1b97f45 Merge remote-tracking branch 'upstream/master' into multivis
# Conflicts:
#	.travis.yml
#	_maps/map_files/MetaStation/z2.dmm
#	_maps/map_files/cyberiad/z2.dmm
#	code/game/atoms_movable.dm
#	code/game/machinery/camera/camera.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/ai/freelook/eye.dm
2018-10-23 17:41:41 -07:00
tigercat2000 fb08ded489 Merge pull request #9934 from lass9030/reaction-scaling
Reaction scaling
2018-10-23 17:19:13 -07:00
tigercat2000 a0d2e1b498 Merge pull request #9955 from variableundefined/FixReagent
Fix reagent dispenser getting attack cooldown
2018-10-23 17:06:43 -07:00
variableundefined 9de64fa8c7 Better fix 2018-10-24 06:53:31 +08:00
dovydas12345 45aab00dbf Update misc_designs.dm 2018-10-23 22:22:17 +03:00
dovydas12345 3cfc7a42fe Adds data disk to misc designs 2018-10-23 22:22:07 +03:00
lass9030 c76f5dc2a9 container 2018-10-23 20:17:35 +02:00
variableundefined b07dab729c Fix reagent dispenser getting attack cooldown 2018-10-23 21:54:46 +08:00
variableundefined 0ddd639bb2 Merge pull request #9938 from Fox-McCloud/destroy-reagents
Helps Reagents GC Better
2018-10-23 20:49:30 +08:00
tigercat2000 48224341ae Merge pull request #9943 from Certhic/autopsy-scan-unresponsive-fix
fix: autopsy scanner unresponsiveness
2018-10-22 11:19:41 -07:00
tigercat2000 2cc0958529 Merge pull request #9941 from SamHPurp/sdql-typo
Fixes typo in a warning message
2018-10-22 10:34:01 -07:00
Alonefromhell 8a023482a4 ++ =/= + 1 2018-10-22 14:38:40 +02:00
tigercat2000 7ae10e2168 Merge pull request #9937 from SamHPurp/empty-icon-files
Removes some empty icon files
2018-10-21 15:58:13 -07:00
Certhic b5e8e5e88f fix: autopsy scanner unresponsiveness 2018-10-21 20:41:32 +02:00
Purpose ecb466507e super important 2018-10-21 18:23:55 +01:00
Fox McCloud 00e3d2c097 uhhhhhh 2018-10-21 12:09:45 -04:00