cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 06:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,953 Commits 26 Branches 2 Tags
36f9727d4d0dcd6380b05d8a7604e795b8aebc95
Commit Graph

477 Commits

Author SHA1 Message Date
Fox McCloud
36d4298e2b Merge pull request #7198 from Crazylemon64/organ_varname_refactor 
Refactors "organs" to be "bodyparts" to end confusion once and for all
 2017-04-30 17:00:44 -04:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
scrubmcnoob
329fba9f14 Requested Changes 
All the changes requested.
 2017-04-29 21:58:27 -04:00
scrubmcnoob
20c4384828 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2017-04-29 19:42:10 -04:00
Crazy Lemon
67f72b2791 Merge pull request #7109 from Lady-Luck/syndibundles 
Syndicate Bundle Adjustments
 2017-04-21 09:25:38 -07:00
Mark van Alphen
d786a78e2e Merge branch 'master' into findnreplace 2017-04-19 20:41:05 +02:00
Krausus
4572ad6af4 Fixes matchboxes lacking storage limitations 2017-04-16 22:53:03 -04:00
Lady-Luck
b9274b6654 Reverts removal of the uplink implant to the implant bundle, instead just removes EMP and Microbomb. 2017-04-16 14:57:31 -05:00
Lady-Luck
e767fdab8a Changes the two red energy swords into a red double-bladed energy sword (reverted from commit 46d4c5b9c7) 2017-04-15 17:05:22 -05:00
Lady-Luck
46d4c5b9c7 Changes the two red energy swords into a red double-bladed energy sword 2017-04-15 16:19:01 -05:00
Lady-Luck
0d1179a54a Adjusts syndicate bundles, adds Allies Cocktail object for bond bundle 2017-04-15 16:01:09 -05:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace 
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
 2017-04-14 18:15:12 +02:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Sam
dba6c293c7 Increases the number of construction permits 2017-03-24 21:26:38 +00:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +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
Mark van Alphen
b26d50d9f9 Merge branch 'master' into findnreplace 2017-03-08 10:37:10 +01: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
Markolie
9594ec245b Change CE belt path to /full with tools 2017-03-07 18:16:30 +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
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
9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00: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
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Krausus
4754d6b4b3 Fixes some sounds not being cached properly 2017-02-17 02:37:26 -05:00
Crazy Lemon
685250501b Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor 
Monkey cube refactor
 2017-02-07 19:53:58 -08:00
Fox-McCloud
f8602ffef8 last fixes, hopefully 2017-02-04 04:28:42 -05:00
Fox-McCloud
78a2518135 Monkey cube refactor, pre-map 2017-01-31 20:44:52 -05:00
Fox-McCloud
80587202fe forcemove fixes 2017-01-27 21:03:57 -05:00
Fox-McCloud
51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Crazy Lemon
0e42e416b6 Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor 
Makes Reagents Holder Process and Refactors NOREACT
 2017-01-26 03:47:30 -08:00
Fox-McCloud
36bfee25dc last of the missing stuff, hopefully 2017-01-24 18:33:22 -05:00
Fox-McCloud
3e87bd3370 more adjustments and fixes 2017-01-23 05:56:17 -05:00
Fox-McCloud
7007f6bbdf Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-23 01:01:09 -05:00
Fox-McCloud
ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Crazy Lemon
37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Fox-McCloud
ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Crazylemon64
224f86bd64 Bibles can reveal runes now 2017-01-13 13:42:56 -08:00
Crazy Lemon
f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
Fox-McCloud
a1b8205fdd food 2016-11-29 08:45:46 -05:00
Aurorablade
23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul 
Ports over the status effect unification from the extreme refactor
 2016-10-30 22:40:24 -04:00
Markolie
a77b501ebf Runtime fix 2016-10-27 15:03:07 +02:00
Markolie
4dcb46d295 More minor briefcase changes 2016-10-27 15:00:31 +02:00