cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 16:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,875 Commits 29 Branches 2 Tags
1c05fb85e6ff92569f0796bf4ea984068fbaffc2
Commit Graph

182 Commits

Author SHA1 Message Date
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
 2019-09-28 00:16:11 -04:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Fox McCloud
6caec96c2a fixed 2019-03-20 01:56:46 -04:00
Fox McCloud
cc1b49eed6 fix 2019-03-18 23:19:13 -04:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Citinited
6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
Aurorablade
1baf06f66a removes one the leavesanother 2018-10-25 03:46:42 -04:00
Aurorablade
4426834521 HOTFIX 2018-10-25 03:17:50 -04:00
Aurorablade
654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
Purpose
d11a0ac95b visibility 2018-10-14 11:52:09 +01:00
Aurorablade
6d4d4ba8a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-09-06 21:46:19 -04:00
variableundefined
eaf4d642cb Adds overheal to welder & cable coil 2018-07-26 22:22:50 +08:00
Aurorablade
c295d4da36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-07-12 18:20:12 -04:00
Fox McCloud
27ebe7a6fe Standardized Robotic Organ Checking--Removes Mechassited Organs 2018-07-07 21:33:42 -04:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Aurorablade
34809e208a Fox twerks 2018-04-22 02:09:54 -04:00
Aurorablade
72a3c66cf5 IPC bleeding v2 2018-04-22 00:21:48 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown
edda7c9c52 make power tools and abductor tools use titanium 2018-02-21 11:09:47 +05:00
Fox-McCloud
027e7619f5 Removes All Comments about auto-correction and Finddeclaration.exe 2017-07-22 02:54:45 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
Sam
d0dde4f3d7 Uses more QDEL_NULLs 2017-06-15 00:49:00 +01:00
Sam
4d57fff5c9 Updates Intents 2017-06-10 09:43:36 +01:00
FlattestGuitar
96b2242aee fixes welder runtime 2017-05-18 12:01:24 +02:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Fox McCloud
bce6befcd1 Merge pull request #6770 from KasparoVy/tools-inhands 
Fixes and Adds some Inhand Icons for Tools, TG Tool Inhand Sprite Parity
 2017-03-24 19:00:34 -04:00
Crazy Lemon
87e4993152 Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor 
Fixes Power Tools Materials and Recators Laser Scalpels
 2017-03-23 15:20:56 -07:00
FlattestGuitar
c1fcb9a87c < 2017-03-22 09:24:03 +01:00
KasparoVy
eb43a48f67 Resolves conflicts with baseball PR. 2017-03-21 16:16:16 -04:00
Sam
e43cb810a8 More bits wew. 2017-03-20 06:37:56 +00:00
Sam
343d466287 Reverts NanoTrasen edits following convo with Fox/Regen 2017-03-19 21:31:42 +00:00
Sam
db89c499ce Fixes some capitalisation stuff... 
Pedantry!
 2017-03-19 01:09:47 +00:00
KasparoVy
cdc07fac4a Also fixes red crowbar's inhands being the wrong one. 2017-03-14 16:16:37 -04:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
Fox-McCloud
9e94f2ceeb Fixes Power Tools Materials and Recators Laser Scalpels 2017-03-09 02:08:42 -05:00
Markolie
2c23fbe34d Forgot to commit tools 2017-03-07 18:14:04 +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
Markolie
5989862d37 Fix space 2017-03-05 23:30:41 +01:00
Markolie
9ec1400ae1 Fix comments 2017-03-05 23:04:41 +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