cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 01:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,737 Commits 29 Branches 2 Tags
eea5233d82deed9edd50eb2a3a5ee0cefd5eab1a
Commit Graph

18479 Commits

Author SHA1 Message Date
tigercat2000
d6a852bcfa Merge remote-tracking branch 'upstream/master' into mechastuff 
# Conflicts:
#	code/game/mecha/mecha.dm
 2018-11-01 08:37:46 -07:00
variableundefined
aaffaedb37 Merge pull request #10057 from warior4356/drone-death 
Solves ghosts re-entering shutdown drones by making the ghost unable to reenter corpses
 2018-11-01 16:16:48 +08:00
variableundefined
401f639870 Merge pull request #10079 from Citinited/aaaaa 
Kills another disposals nullspace bug
 2018-11-01 07:15:35 +08:00
Citinited
1af2c7cb14 kills another nullspace bug 2018-10-31 22:08:54 +00:00
Arkatos1
9aed1d6697 Fixes Rewriter drink description typo 2018-10-31 14:23:04 +01:00
tigercat2000
6028fc83c3 Not quite done yet 2018-10-30 22:57:42 -07:00
warior4356
c6249d89f5 Fixed by not allowing ghost to reenter corpse. 2018-10-30 19:06:23 -07:00
warior4356
c3236e84ac Revert "Makes drone gib on shutdown" 
This reverts commit 8860b285ff.
 2018-10-30 18:50:32 -07:00
variableundefined
f7481c6f6e Merge pull request #10055 from Jountax/master 
Renames Ice Peppers to Chilly Peppers
 2018-10-31 07:49:48 +08:00
TatsumakiMagi
6f07fd668a Fixes adjacency issues with merch shop, arcade shop and give command 2018-10-30 23:21:57 +00:00
variableundefined
4778d4de5d Merge pull request #10062 from Dave-TH/paper_fix 
Paper Bundles No Longer Automatically Display Their Contents
 2018-10-30 10:53:58 +08:00
Unknown
f4d5f73261 Fixes Paper Bundles Bug 2018-10-29 21:31:49 -04:00
variableundefined
a6b76bd701 Merge pull request #10058 from warior4356/Drone-ID 
Fixes ID based runtime on shutting down drones
 2018-10-30 08:09:11 +08:00
warior4356
028b53b055 Fixes ID based runtime on shutting down drones 2018-10-29 16:56:09 -07:00
warior4356
8860b285ff Makes drone gib on shutdown 2018-10-29 14:55:14 -07:00
Jountax
eb182aa1fb Update chili.dm 2018-10-29 16:12:28 -04:00
Jountax
2e2af221fa Update chili.dm 2018-10-29 15:31:23 -04:00
joep van der velden
07e419a8a4 Items dropped in a pod will now stay in the pod. 2018-10-29 20:31:11 +01:00
variableundefined
6e7b672ec8 Merge pull request #9975 from Citinited/assembly-code-cleanup 
Assembly devices minor refactor & code cleanup
 2018-10-29 22:00:13 +08: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
variableundefined
c59b1d32a1 Merge pull request #9994 from Fox-McCloud/colorful-blood 
Colorful Reagent Changes Blood Color
 2018-10-28 08:42:07 +08:00
variableundefined
493e7574a1 Merge pull request #9985 from Fox-McCloud/new-sprite 
New Oil Can Sprite
 2018-10-28 08:41:05 +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
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
696237d87b Fixed the AI thingy 2018-10-27 16:43:09 +02: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
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
Citinited
8f3b8378dc Cleans up assembly code 2018-10-27 13:29:07 +01: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