cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,957 Commits 26 Branches 2 Tags
a803500489dbee9d3cfda7e2fbb4b6d34ca7260a
Commit Graph

15500 Commits

Author SHA1 Message Date
Krausus
a803500489 Fixes admin bwoink preference 
Non-admin players no longer get the (unusable) verb to toggle it, nor is
its setting respected when PMing them
 2017-03-10 19:46:35 -05:00
Markolie
0bc0a2c461 All types of crystals 2017-03-10 12:45:47 +01:00
Markolie
cf4f350a79 Let matter grippers carry firelock electronics and bluespace crystals 2017-03-10 12:44:37 +01:00
Markolie
a6a7cf9d36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into zefix 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/game/jobs/job/job.dm
 2017-03-10 12:42:37 +01:00
Fox McCloud
d7d1e42cc2 Merge pull request #6678 from LordJike/carrot-tweaks 
Makes carrots processable into wedges and makes said wedges fryable into carrot fries
 2017-03-09 21:36:40 -05:00
Fox McCloud
9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line 
Streamlines the ghost-to-player creation process
 2017-03-09 21:30:22 -05:00
Markolie
a376adc93e Merge branch 'zefix' of https://github.com/Markolie/Paradise into zefix 2017-03-09 17:42:21 +01:00
Markolie
7cb52433d1 Fix AI blind issue 2017-03-09 17:41:46 +01:00
Mark van Alphen
93470e3570 Merge branch 'master' into zefix 2017-03-09 17:20:31 +01:00
Crazylemon64
869c9b76c4 Streamlines the ghost-to-player creation process 
Also refactors ERT equipment to be actual outfits instead of hardcoded
 2017-03-08 05:49:49 -08: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
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
Jike
041c573f42 Makes carrot wedges available through the processor instead of cutting with a knife 2017-03-06 18:15:47 -04:30
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +01:00
Fox-McCloud
41d4c83f17 Refactors Money 2017-03-06 04:52:03 -05: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
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
Markolie
02c4cd26f4 Final fixes 2017-03-05 16:42:14 +01:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01: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
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
Jike
07982121ec Carrots can be sharpened again, carrot shivs can be cut into wedges 2017-03-04 23:13:04 -04:30
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
Crazy Lemon
0d5d8e6cbe Merge pull request #6597 from davipatury/wires-ui 
Wires Nano-UI-ification
 2017-03-04 10:21:19 -08:00
Jike
7fc798b299 Full tweak 2017-03-04 05:18:02 -04:30
Crazy Lemon
5e1bd050f8 Merge branch 'master' into adminin 2017-03-03 23:23:40 -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
Fox McCloud
345909d746 Merge pull request #6652 from LordJike/master 
Makes french fries a deep fryer recipe instead of a processor recipe
 2017-03-03 18:26:17 -05:00
Fox McCloud
c2e8ed611b Merge pull request #6659 from uraniummeltdown/orm 
Change ORM input/output dirs with multitool
 2017-03-03 18:17:24 -05:00
Fox McCloud
cb7a3e6db8 Merge pull request #6661 from FlattestGuitar/karmameme 
Adds confirmation prompts to karma purchases ✔️
 2017-03-03 18:16:36 -05:00
Crazy Lemon
8ec9942750 Merge pull request #6637 from Krausus/TableCkeyification 
Makes Karma and Notes Tables Always Use CKeys
 2017-03-02 20:16:08 -08:00
FlattestGuitar
14bc738ca3 Adds confirmation thingies to karma purchases 2017-03-02 20:36:49 +01:00
FlattestGuitar
0a93603bc4 Fixes Spartan's gas mask fluff thing 2017-03-02 19:47:58 +01:00
uraniummeltdown
4d80e4ac36 allow monkeys to use guns 2017-03-02 20:45:42 +04:00
uraniummeltdown
f5de924915 use multitool on open panel orm to change dir of input and output 2017-03-02 18:04:10 +04:00
TravellingMerchant
bc06adc562 Adds the new Cyborg sprites to the sprite select list. 2017-03-02 13:25:46 +00:00