cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-27 22:54:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,899 Commits 12 Branches 2 Tags
42cf53a30fa305883a3b3755de0bed350ec63c3e
Commit Graph

985 Commits

Author SHA1 Message Date
Fox-McCloud
549152f498 Merge remote-tracking branch 'upstream/master' into breathing-tube 2017-07-04 15:33:53 -04:00
Fox-McCloud
e93e4ef090 IPC arm recharger mechfab 2017-07-04 15:28:14 -04:00
Fox-McCloud
b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
Fox-McCloud
6ea2c73b39 derp 2017-06-28 17:32:40 -04:00
Fox-McCloud
6bb4056a87 fix 2017-06-28 17:12:14 -04:00
Fox-McCloud
e8bbe783c6 arm augments 2017-06-28 17:01:34 -04:00
Fox-McCloud
585db8ba28 Breathing Tube Augment 2017-06-27 23:02:48 -04:00
tigercat2000
c6560ef23e Merge pull request #7501 from Fox-McCloud/illegal-implants 
Replaces Illegal R&D Gear with Other Implants
 2017-06-09 14:49:38 -07:00
Fox-McCloud
72557e1c88 Replaces Illegal R&D Gear with Other Implants 2017-06-07 21:27:25 -04:00
Fox-McCloud
e0ea07fc86 Fixes/Tweaks Old Origin Techs 2017-06-03 12:11:46 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Fox McCloud
1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight 
Refactoring to use the WEIGHT_CLASS defines.
 2017-05-28 14:17:05 -04:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Fox McCloud
3587aad06e Merge pull request #6612 from Crazylemon64/partial_cloning 
Cloning now puts you together bit by bit
 2017-05-27 14:48:23 -04:00
tigercat2000
7110e7cd6e Merge pull request #6772 from Kyep/mech_weapons 
Ports tesla mech gun, also adds xray/immolator guns
 2017-05-22 13:01:10 -07:00
Crazylemon64
8a065238e8 Cloning now puts you together bit by bit 2017-05-01 05:34:12 -07:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07: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
Crazy Lemon
f9ee33a797 Merge pull request #7054 from Fox-McCloud/destroy-qdelnull 
Converts Most Destroys to use QDEL_NULL
 2017-04-05 23:49:19 -07:00
Fox McCloud
4fd0ca5d82 Merge pull request #7029 from davipatury/rcl-design 
Gives RCL an autolathe design
 2017-04-06 02:33:32 -04:00
Fox McCloud
4ad7cd17fd Merge pull request #7043 from SamHPurp/assorted-fixes 
Fixes
 2017-04-05 19:15:12 -04:00
Fox-McCloud
5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
davipatury
76d70b85ff Gives RCL a autolathe design. 2017-04-04 19:09:23 -03:00
Fox-McCloud
8fb17b2bee moarrr 2017-04-04 04:26:53 -04:00
Sam
ae6dac5c5a Fixes Recitence -> Reticence 2017-04-04 09:04:03 +01:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Crazy Lemon
9c233a676d Merge pull request #6865 from Fox-McCloud/receiverssss 
Adds Modular Receivers to Loot Table and Hacked Autolathes
 2017-03-30 18:32:32 -07:00
davipatury
8963e96c41 effect/spider to structure/spider 2017-03-27 19:01:25 -03:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Fox-McCloud
182dcd93b5 autolathe receivers 2017-03-24 16:57:25 -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
Fox-McCloud
6e22561208 Expands Autolathe Items and Enables Stock Parts 2017-03-21 20:04:26 -04:00
Kyep
6eb35ea4e9 Old Faithful -> Firedart 2017-03-18 15:38:25 -07:00
Kyep
713014196e Tweak 
Tweak 2
 2017-03-16 22:42:16 -07:00
Kyep
cf271b710d Neca Tweaks 
- DS/Gamma ERT mechs now have single-shot x-ray lasers to deal with
blobs.
- X-ray laser is no longer buildable by crew.
 2017-03-16 22:37:29 -07:00
Kyep
649bbfd35e Admin mech weapons 2017-03-15 23:45:51 -07:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
Kyep
ac877a1337 Ports tesla mech gun, also adds xray/immolator guns 2017-03-15 03:27:58 -07:00
Jovan
65cb35fbb2 please no merge conflict. 2017-03-11 19:21:06 -05:00
Jovan
54ee658a94 mesies fix voxy stuff, yaya? 2017-03-11 16:50:13 -05:00
Fox McCloud
d6da6e3f52 Merge pull request #6527 from davipatury/modular_computers 
Port's TG's modular computers
 2017-03-11 04:51:49 -05: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
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie
3b73053bc4 Tool fixes 2017-03-06 20:46:24 +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
9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
davipatury
af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
davipatury
8c7993b9d5 Crazylemon's suggestion. 2017-03-04 15:43:28 -03:00