cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,918 Commits 29 Branches 2 Tags
bbdf2fb05a7dc25cdaa0358c78ad3222c2e1dc87
Commit Graph

24995 Commits

Author SHA1 Message Date
Fox McCloud
bbdf2fb05a Merge pull request #6713 from Luthix/toxlaunch 
Fix toxins launch room
 2017-03-09 21:26:43 -05:00
Fox McCloud
d18f862775 Merge pull request #6695 from Markolie/toolz 
Tool overhaul
 2017-03-09 01:43:18 -05:00
Fox McCloud
060c419689 Merge pull request #6575 from FlattestGuitar/magistrate 
Buffs Magistrate 👌
 2017-03-08 20:33:29 -05:00
Luthix
01b1668470 Add toxins launch area 2017-03-08 14:40:41 -07:00
Markolie
8ed466955e Surgery toolspeed changes 2017-03-08 10:46:43 +01:00
Markolie
acab5d5170 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz 
# Conflicts:
#	code/game/objects/items/weapons/storage/bags.dm
#	code/game/objects/items/weapons/storage/uplink_kits.dm
#	code/game/objects/items/weapons/storage/wallets.dm
 2017-03-08 10:45:16 +01:00
Crazy Lemon
6e7338a573 Merge pull request #6688 from Allfd/bible 
Makes bible farting less predictable
 2017-03-08 00:24:44 -08:00
Fox McCloud
aa6e25a7f3 Merge pull request #6648 from Kyep/event_rebalance 
Tweaks Event Odds
 2017-03-08 01:02:02 -05:00
Kyep
689f515388 Changed Traders chance back to 0 2017-03-07 21:41:18 -08:00
Fox McCloud
f96c335d1f Merge pull request #6704 from uraniummeltdown/hardsuit 
Rename all "rigs" (hardsuits) to hardsuits
 2017-03-07 23:35:07 -05:00
Fox McCloud
c973875b95 Merge pull request #6675 from Crazylemon64/monster_allocator_port 
Ports Monster's finishing of the space allocator
 2017-03-07 23:21:50 -05:00
Crazy Lemon
fc272c33be Merge pull request #6700 from Fox-McCloud/money-money-money 
Refactors Money
 2017-03-07 20:04:29 -08:00
Fox McCloud
5a9ff41464 Merge pull request #6591 from Crazylemon64/ipc_power_cord 
Replaces the IPC APC grabbing thing with a power cord and lets IPCs be genderless
 2017-03-07 22:25:11 -05:00
Fox McCloud
98ca147802 Merge pull request #6687 from MarsM0nd/Cult-boots 
Cult shoes
 2017-03-07 22:22:05 -05:00
Markolie
9594ec245b Change CE belt path to /full with tools 2017-03-07 18:16:30 +01:00
Markolie
2c23fbe34d Forgot to commit tools 2017-03-07 18:14:04 +01:00
Markolie
32b8158796 Increase Jaws of Life door open time from 5 to 10 seconds 2017-03-07 18:13:13 +01:00
uraniummeltdown
dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Mars
5dd4d6d400 Better equip 
replaces if statements with checked equip.
 2017-03-07 10:39:33 +01:00
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Markolie
2c8ca5079f Comments 2017-03-06 13:07:13 +01:00
Fox-McCloud
41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05:00
Markolie
960b1206bd Fix wire path 2017-03-05 23:36:18 +01:00
Markolie
5989862d37 Fix space 2017-03-05 23:30:41 +01:00
Markolie
44e8080de2 Fix design names 2017-03-05 23:05:19 +01:00
Markolie
9ec1400ae1 Fix comments 2017-03-05 23:04:41 +01:00
Markolie
117d4de209 Fix proc 2017-03-05 20:34:22 +01:00
Markolie
ec699eb27d Add airlock interaction to jaws 2017-03-05 20:31:02 +01:00
Markolie
9aa819eea3 Lets make the medical wrench admin only, because it's basically a /tg/ meme 2017-03-05 20:19:40 +01:00
Markolie
d877ef1de3 Fixes 2017-03-05 20:14:06 +01:00
Markolie
9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
Mars
6724eb8bed Summon as necessary 
Rewrites the tome to fit that equipment will only be spawned if needed,
and does so in the code.
 2017-03-05 11:00:27 +01:00
Mars
187a70c249 derp 
Correctly equips shoes to the shoes slot.
 2017-03-05 10:40:15 +01:00
Fox McCloud
15cda911f4 Merge pull request #6668 from Kyep/objective_announce 
Makes objective changes more obvious
 2017-03-05 03:06:55 -05:00
Fox McCloud
03b5a5efaa Merge pull request #6660 from uraniummeltdown/monkey 
Allows monkeys to use all guns
 2017-03-05 03:03:45 -05:00
Fox McCloud
dfa46a3181 Merge pull request #6686 from MarsM0nd/Bags 
Small backpack sprite fix
 2017-03-05 02:57:21 -05:00
Fox McCloud
f18ae48808 Merge pull request #6655 from Kyep/poison_pen 
Poison Pen, QM/HoP/CargoTech Traitor Item
 2017-03-05 02:36:45 -05:00
Kyep
18eb3fa4e0 Cost: 5->2 TC, Reagent:Sarin->Amanitin 2017-03-04 22:50:20 -08:00
Alffd
35f34a3a24 Removes adminlog 2017-03-04 17:34:36 -05:00
Alffd
900aeb1239 Makes bible farting less predictable 2017-03-04 16:38:15 -05:00
Mars
17049993d4 Gives Cult some more flavour. 
Gives Cult cult shoes on the usage of the arming talisman, small change
to the description ot the talisman to account for the boots and that you
get the items in your backpack instead of them not getting spawned.
 2017-03-04 20:13:03 +01:00
Mars
52b15a8f35 Small sprite fix 
Gives the grey satchel the grey satchel sprite instead of the leather
one.
 2017-03-04 19:36:30 +01:00
Crazy Lemon
0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui 
Wires Nano-UI-ification
 2017-03-04 10:21:19 -08:00
davipatury
3a10ee852a Crazylemon's suggestion. 2017-03-04 14:17:57 -03:00
Crazy Lemon
5e1bd050f8 Merge branch 'master' into adminin 2017-03-03 23:23:40 -08:00
Crazy Lemon
af0c0d844b Merge pull request #6630 from davipatury/newscaster-ui 
Newscaster Nano-UI-ification
 2017-03-03 21:20:53 -08:00
Crazy Lemon
57ad4776c5 Merge pull request #6632 from davipatury/tank_dispenser-ui 
Atmos Nano-UI-ification
 2017-03-03 21:11:13 -08:00
Crazylemon64
36255fffad Ports Monster's finishing of the space allocator 2017-03-03 17:47:10 -08:00
Fox McCloud
64f7eeeb75 Merge pull request #6658 from TravellingMerchant/master 
Adds a new Cyborg sprite for all the basic departments.
 2017-03-03 18:28:01 -05:00