cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,703 Commits 26 Branches 2 Tags
7428362d2f5ead42a86f3638f6d5e5c1c3d168e8
Commit Graph

29912 Commits

Author SHA1 Message Date
variableundefined
7428362d2f Fixes typo 2018-11-03 20:30:52 +08:00
variableundefined
7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08: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
ba6c5acf99 Merge pull request #10009 from alex-gh/tabling_exploit_fix 
Fixed tabling through solid objects.
 2018-10-30 21:34:15 +08:00
variableundefined
ed30ce21fa Merge pull request #10029 from farie82/oil-dispenser 
Gives cargo the ability to buy an Oil tank.
 2018-10-30 20:55:14 +08:00
alex-gh
9b6f1248c6 Fixed tabling through solid objects. 2018-10-30 12:36:30 +01: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
warior4356
6bbfd38148 Fixes silicons pressing door buttons and doors not opening. 2018-10-29 17:56:38 -07: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
variableundefined
3d0a7a56aa Merge pull request #10056 from warior4356/drunk-megaphone 
Adds speech impediment handling to megaphones
 2018-10-30 07:59:11 +08:00
warior4356
028b53b055 Fixes ID based runtime on shutting down drones 2018-10-29 16:56:09 -07:00
warior4356
8a0767a88a Adds speach impediment handling to megaphones 2018-10-29 14:33:35 -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
variableundefined
83fdc7f2db Merge pull request #10043 from Squirgenheimer/mechafixes 
Two mech bug fixes (deletion runtime and speech bubbles)
 2018-10-29 21:29:04 +08:00
variableundefined
eafc4ec937 Merge pull request #10045 from Squirgenheimer/miningsatchelfix 
fixed number of mining satchel slots
 2018-10-29 21:25:06 +08:00
Squirgenheimer
687d2c8f0f changed number of mining satchel slots to 10 2018-10-29 05:17:50 -04: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
Squirgenheimer
926c4a5e17 fixes deleting mechs causing a runtime 
-removed unnecessary code handled by detach()
 2018-10-29 01:39:48 -04:00
variableundefined
5e87e2e984 Merge pull request #10037 from farie82/Round-start-time-config 
Made the round start time variable using the config.txt
 2018-10-29 10:30:15 +08:00
variableundefined
cd553f1be6 Merge pull request #10028 from SomeSortaSquid/master 
Fix for Airlocks Shocking Remotely
 2018-10-29 08:00:16 +08:00
joep van der velden
b332cda61d Made the round start time variable using the config.txt 2018-10-28 20:24:56 +01:00
tigercat2000
a5bfc7df1e Merge pull request #10033 from alex-gh/ticker_delay_fix 
Fixes shadowling game mode delaying the game ticker
 2018-10-28 10:10:29 -07:00
alex-gh
d6d8e4b757 Fixed shadowling gamemode delaying the game ticker 2018-10-28 16:54:20 +01:00
SomeSortaSquid
bfbd4213d3 Cleaned Up Airlock Remote Electrocution Fix 
Tested locally, works as expected.
Airlocks only electrocute people standing next to them.
 2018-10-28 15:04:52 +01:00
joep van der velden
61f931e7c6 Gives cargo IPC blood 2018-10-28 13:13:16 +01:00
SomeSortaSquid
679e3be82b Electrified Airlock Fix 
Previously electrified airlocks had no adjacency check, only UI.
This led to remote electrocutions.
 2018-10-28 11:24:56 +01: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
variableundefined
462d38390e Merge pull request #9995 from Mitchs98/secjacket 
Adds the Security Jacket to Security Lockers.
 2018-10-28 12:11:14 +08: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
variableundefined
6bece25226 Merge pull request #10008 from Normalyman/Test 
Dragging won't open containers while incapacitated
 2018-10-28 08:40:37 +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
Normalyman
3d1111ddaf Requested Change 2018-10-27 19:54:06 +02:00
tigercat2000
daef5eec4c Merge pull request #10019 from Aurorablade/DammitTiger 
Fixes where tiger wasn't actually checking for the /airlock subtype in RCD code
 2018-10-27 10:49:49 -07: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
Aurorablade
d9e3693caf It wwasn't checking for /airlock 2018-10-27 13:28:51 -04: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