cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,148 Commits 26 Branches 2 Tags
2a3e27e14d9f5f802d901b57895e25cb146e9aff
Commit Graph

237 Commits

Author SHA1 Message Date
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global 
Updates global lists to the global var subsystem.
 2018-10-12 13:18:28 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
 2018-10-09 10:06:03 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Birdtalon
1628467857 Merge branch 'master' into ERT-changes 
# Conflicts:
#	icons/mob/head.dmi
 2018-09-30 14:53:32 +01:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
Birdtalon
55fa8bb5bd tidying up 2018-09-22 15:53:37 +01:00
Birdtalon
d6dc26cf22 adds ERT sidearm "PDW-9" 2018-09-20 21:45:46 +01:00
Birdtalon
8ed6cd380c adds extra icon overlay 2018-09-03 18:11:20 +01:00
Birdtalon
5275b5f56f further gun tweaks/changes, adds sprite 2018-08-31 19:12:39 +01:00
Birdtalon
49e47d00bb adds multi lens immolation gun 2018-08-29 18:57:35 +01:00
Crazy Lemon
294c3c3ae9 Merge pull request #9284 from variableundefined/KineticAccelerator 
Add in logging for kinetic accelerator
 2018-08-22 22:31:57 -07:00
Kyep
1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Crazy Lemon
64058328d9 Merge pull request #9281 from CornMyCob/desc-fixes 
Small grammar fixes
 2018-07-31 17:01:24 -07:00
variableundefined
a0dacfb6be Fix runtime 2018-07-31 20:42:06 +08:00
variableundefined
617d39a9e5 Add in logging for kinetic accelerator 2018-07-31 20:00:02 +08:00
CornMyCob
b08ebd0cbe Small grammar fixes 2018-07-30 22:45:56 +01:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Fox McCloud
c5cbb0414a Fixes Basilisk Projectiles 2018-05-14 19:27:43 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
shazbot194
f1bc8aa2cc Changes the charge back to 600 2018-02-19 22:26:53 -09:00
shazbot194
e6cbce1eaa Makes it just the mini 2018-01-28 19:07:49 -09:00
shazbot194
980d452f1c Adds in the energy pistol 2018-01-27 14:33:28 -09:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00
Alffd
e72d2852c2 Ion Rifles are not pistols 2017-10-23 19:00:12 -04:00
Ansari
db8ecd2e6e Add two ammo_casing. Increase energy cost to 300. 2017-10-02 18:11:04 +08:00
Fox McCloud
ae1128b33d Merge pull request #7787 from imsxz/honk-rifle-self-charge 
Makes HONK Rifle selfcharge
 2017-07-25 11:46:36 -04:00
imsxz
39961ea353 Makes honk rifle charge automatically 2017-07-13 14:22:19 -04:00
Fox-McCloud
05a24da2e8 The Most Non-Edgey PR Ever 2017-07-01 19:48:43 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Crazylemon64
4936a18e70 Merge branch 'master' into remap_centcom 2017-05-20 14:40:03 -07:00
Fox-McCloud
183702a36e fix up 2.0 2017-04-02 00:38:14 -04:00
Fox-McCloud
35ab7ada94 Refactors Cell Energy Values 2017-04-01 20:14:29 -04:00
Kyep
39e241bd3a Disconnects Prison, Adds Pulse Turrets 2017-03-12 00:25:18 -08:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Markolie
c5b897a951 Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers 2017-02-22 18:24:43 +01:00
Markolie
56dd8b189e Proper fix for minebot damage issue 2017-02-15 17:23:57 +01:00
Markolie
519749cf8d Fix OP minebots, move them into a separate file 2017-02-15 16:21:04 +01:00
Markolie
924e539f22 Chassis mods now rename KA, remove cost from chassis mods/tracer mods 2017-02-08 19:27:16 +01:00
Markolie
053ff0fbbb KA energy adjustments 2017-02-08 03:03:45 +01:00
Markolie
0790ed5f8d KA fixes, upgrade typo fix 2017-02-08 02:45:13 +01:00
Markolie
7a4c33bbcd Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions 2017-02-06 19:55:37 +01:00
Markolie
2a23862c6a Kinetic accelerator update, other fixes 2017-02-06 18:39:03 +01:00
Markolie
88b2bf1a28 X-01 grammar fix 2016-10-24 16:43:30 +02:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00
jughu
d9d5b41521 Yaya 2016-09-11 23:36:51 +02:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00