cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,715 Commits 26 Branches 2 Tags
0ee51bdcc2d60fadb5152ab46db677a7b9db060c
Commit Graph

8659 Commits

Author SHA1 Message Date
TatsumakiMagi
6f07fd668a Fixes adjacency issues with merch shop, arcade shop and give command 2018-10-30 23:21:57 +00:00
warior4356
028b53b055 Fixes ID based runtime on shutting down drones 2018-10-29 16:56:09 -07:00
Squirgenheimer
c6da75590c say code correction 
-we should be using the loc of the mob to create a speech bubble, not the loc of the loc of the mob
-speech bubbles created by mobs inside a mech will now follow the mech
 2018-10-29 03:43:04 -04:00
variableundefined
fb549d8f16 Merge pull request #10027 from Ty-Omaha/hostile-mob-fix 
Hostile mob fix V2
 2018-10-28 16:33:24 +08:00
Ty-Omaha
ffe39f4500 hostile mob fix v2 2018-10-28 03:56:02 -04:00
variableundefined
6cd92feb09 Merge pull request #10026 from Ty-Omaha/hostile-mob-fix 
Hostile mob fix
 2018-10-28 15:14:43 +08:00
Ty-Omaha
7f3791c30a hostile mob fix 2018-10-28 01:51:26 -04:00
Ty-Omaha
06424c8276 pull fix 2018-10-27 23:30:01 -04:00
variableundefined
d828093feb Merge pull request #10010 from dovydas12345/Two-handed-catch 
Fixes catching two handed items with one hand
 2018-10-28 08:46:51 +08:00
variableundefined
9e8a40463e Merge pull request #10018 from dovydas12345/Dead-pull 
Fixes being able to pull when incapacitated
 2018-10-28 08:45:11 +08:00
dovydas12345
892478ab94 Spelling 2018-10-27 20:55:00 +03:00
dovydas12345
de09a1f309 Requested changes, removes fail message 2018-10-27 20:54:31 +03:00
dovydas12345
10c235378f Updates to the way asked. 2018-10-27 20:35:34 +03:00
dovydas12345
fa14d7b734 Update pulling.dm 2018-10-27 20:32:15 +03:00
tigercat2000
0d876f3351 Merge pull request #10017 from alex-gh/borg_suicide_fix 
Added borg suicide examine message.
 2018-10-27 10:28:38 -07:00
dovydas12345
52457ebdf6 No more zombie arms 2018-10-27 20:20:51 +03:00
alex-gh
5f76476212 Added borg suicide examine message. 2018-10-27 18:44:55 +02:00
variableundefined
06cefb26d6 Merge pull request #10014 from farie82/AI-runtime 
Fixed the AI thingy
 2018-10-27 22:56:28 +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
696237d87b Fixed the AI thingy 2018-10-27 16:43:09 +02:00
dovydas12345
e3ffe1098b Wooops 2018-10-27 16:12:45 +03:00
dovydas12345
1bd51e6daa No more failed message, when they aren't trying to catch it 2018-10-27 16:01:24 +03:00
dovydas12345
7209b9107e No more catching two handed items with one hand 2018-10-27 15:48:12 +03: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
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
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
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
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
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
variableundefined
0ddd639bb2 Merge pull request #9938 from Fox-McCloud/destroy-reagents 
Helps Reagents GC Better
 2018-10-23 20:49:30 +08:00
Fox McCloud
00e3d2c097 uhhhhhh 2018-10-21 12:09:45 -04:00
variableundefined
e2f7b7e388 Deconflict once again 2018-10-21 10:18:15 +08:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
variableundefined
d67059102e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RelPath 2018-10-20 15:14:12 +08:00
variableundefined
82d00ca7f7 Merge pull request #9894 from craftxbox/patch-1 
add check to make sure person downloading pAI isnt dead.
 2018-10-20 12:56:46 +08:00
craftxbox
2e8c655f67 add adjacent check too. 2018-10-20 01:56:21 -02:30
craftxbox
2a3e27e14d use better dead checking methods. 2018-10-20 01:56:01 -02:30