cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-27 10:32:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
Markolie
42dd08ff7d Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation 2014-11-22 02:24:21 +01:00
Markolie
229824afc4 Fix duplicate numbers in autolathe 2014-11-22 00:59:24 +01:00
Markolie
24fcbb5de4 Autolathe fix 2014-11-22 00:53:09 +01:00
Markolie
e0234565bc Remove the duplicate decloner 2014-11-22 00:37:55 +01:00
Markolie
1269fe7d4e Fix encryption key name 2014-11-21 23:58:13 +01:00
Markolie
7415d1be99 Add the decloner to R&D 2014-11-21 21:50:01 +01:00
Markolie
3d806081d0 Let protolathe's be loaded with chemicals again, let circuitprinter drop chemicals when deconstructed 2014-11-21 21:39:43 +01:00
Markolie
5b3df5a690 Fix names of scanning modules 2014-11-21 19:40:31 +01:00
Markolie
b64a09ec6c Fix grilles 2014-11-21 19:15:42 +01:00
Tigercat2000
08016a957d Adds Machine-People specific *buzz *ping and *beep emotes. 2014-11-20 21:36:10 -08:00
Tigercat2000
ef82aa2d70 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-20 20:59:46 -08:00
Tigercat2000
067d9565e3 Changes the button for admin OOC color to be descriptive of such. "OOC 
Text Color" to "Personal OOC Text Color"
 2014-11-20 20:13:31 -08:00
Markolie
6595b8c38e Fix cloning/telebaton 2014-11-21 04:31:38 +01:00
Markolie
421c461705 Some more map fixes 2014-11-21 03:17:10 +01:00
Tigercat2000
5eb90608fa Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-20 17:51:02 -08:00
SamCroswell
7c2f2d09d2 Adds Duffelbag, Fixes Inhand for Hammers 2014-11-20 20:04:41 -05:00
Markolie
e9e3705e61 Minor map fixes, teleporter description fix 2014-11-21 01:18:41 +01:00
Markolie
06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +01:00
Markolie
c2ce8a63b9 Merge conflict 2014-11-20 22:43:31 +01:00
Markolie
dc2efa6dbb Fixing merge conflict 2014-11-20 22:41:34 +01:00
Markolie
03ef55ca4d And recommitting my changes 2014-11-20 22:39:03 +01:00
Mark van Alphen
e3443532c0 Merge pull request #4 from ZomgPonies/master 
Upstream merge
 2014-11-20 22:37:35 +01:00
Markolie
63cb529297 See if this fixes the conflict 2014-11-20 22:37:13 +01:00
Markolie
d8f568494d Let AI state laws over specified channel, lets borgs state laws 2014-11-20 22:27:47 +01:00
Fox-McCloud
16b525684c Merge pull request #500 from SamCroswell/master 
Updates
 2014-11-20 16:09:51 -05:00
Markolie
3777f5c8bf Revert debugging 2014-11-20 20:56:34 +01:00
Tigercat2000
c79cb69c56 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-20 00:21:41 -08:00
Markolie
dd3739119e Properly document harmbatonning removal, window update check 2014-11-20 00:55:26 +01:00
Markolie
e2e996fbbf Glass now changes color when built based on the area, map fixes 2014-11-20 00:08:29 +01:00
Markolie
8f47f50009 Fix stun batons and holographic sign projectors 2014-11-19 20:20:10 +01:00
Markolie
dc89eaba1a Debugging 2014-11-19 02:24:07 +01:00
Markolie
d490c939c0 Capitalization fix 2014-11-19 01:31:34 +01:00
Markolie
59edf2701d Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders 2014-11-18 20:36:40 +01:00
Markolie
4115c98d9d Glass instead of wood for bottles 2014-11-18 17:34:01 +01:00
Markolie
3e67587869 Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles 2014-11-18 17:31:43 +01:00
Markolie
2f7d3ae26d Additional constructable and upgradeable machines, adds soap to drones, updates teleporter 2014-11-18 03:13:12 +01:00
Mark van Alphen
f1278b799d Merge pull request #1 from ZomgPonies/master 
Upstream merge
 2014-11-17 08:48:31 +01:00
Markolie
876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Tigercat2000
5143a5848f Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-16 18:03:37 -08:00
DZD
84bffd2985 Space Helmets No Longer Fall Off 
This includes all hardsuits and such, everything based off the
"/obj/item/clothing/head/helmet/space" class. The Ninja helmet is a
child of it, so the line making it not fall off becomes redundant.
 2014-11-16 19:51:43 -05:00
DZD
0fd91f8a90 Merge remote-tracking branch 'upstream/master' 2014-11-16 18:03:55 -05:00
DZD
b89e99c054 Drag and Drop for Operating Table and Cryosleeper 
-Allows drag + drop to work on operating tables, surgeon borgs can now
place players on operating table.
-Allows drag + drop to work on cryodorms cryopods, cyborgs can now place
SSDs in cryodorms.
 2014-11-16 18:00:03 -05:00
Mark van Alphen
a0bc630efb Update firedoor.dm 2014-11-16 17:00:17 +01:00
SamCroswell
c75529462d Bulldog In-Hand Fix 2014-11-14 23:34:47 -05:00
Markolie
b0963fa860 Slime runtime error fixes, minor map fixes 2014-11-15 05:02:10 +01:00
Markolie
cbe2bee4c2 Crazy amount of map fixes. 2014-11-15 01:39:00 +01:00
SamCroswell
d2d02e400a Syni Venors 2014-11-14 15:41:55 -05:00
Markolie
e49e9a8fbf Make sure Beepsky doesn't arrest the NT Rep for carrying his cane 2014-11-14 20:34:55 +01:00
Markolie
fa8ecd6527 Fix APC runtime error, open nuke interface when inserting disk 2014-11-14 18:37:21 +01:00
Markolie
069cabebf6 Fixes runtime error when fire doors are closed, allows AI/borgs to access firedoors. 2014-11-14 17:03:41 +01:00