cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,828 Commits 26 Branches 2 Tags
b65fbb907ea35c693a2ef48aef656a7d043a2e77
Commit Graph

607 Commits

Author SHA1 Message Date
Mark van Alphen
b65fbb907e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
 2019-05-30 19:35:52 +02:00
Mark van Alphen
eac4f841ce Switch to penetrator/sopo rounds only 2019-05-02 01:39:11 +02:00
Mark van Alphen
5216106192 Uplink kit rebalance 2019-05-01 21:35:56 +02:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Fox McCloud
43338beffe Merge pull request #11126 from Arkatos1/Syndie_Borg_Medibeam 
Adds Medical Beamgun to a Syndicate Medical Cyborg
 2019-04-02 07:19:52 -04:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
Arkatos1
7a298ec9e4 Adds Medical Beamgun to a Syndicate Medical Cyborg 2019-03-25 01:35:50 +01:00
Fox McCloud
182177f6eb grammar/wording 2019-02-23 18:17:21 -05:00
Fox McCloud
bb3f2266cf Adds Compact Sniper Rifle to Uplink 2019-02-17 03:32:10 -05:00
xerdies
2fe8fc3073 Adding new sniper bullets. 2019-02-15 20:35:51 +00:00
xerdies
ede4f5d6c8 Updated to boolean. 2019-02-14 21:10:21 +00:00
xerdies
98c3a35174 Initial Commit for the Donksoft sniper. 2019-02-13 21:41:36 +00:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Diegoflores31
ec630e9fee Update Crossbow.Dm 
A little bit more damage to the makeshift bolt than before 

Before 8 ==> now 10 (like floor tile)
 2019-01-27 01:35:26 -05:00
Granodd
6c53564df2 Merge branch 'master' into GunsAndGunAccessories 
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
 2019-01-26 02:17:22 -05:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade
4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
variableundefined
0b8ce92516 Merge pull request #10652 from AzuleUtama/syndieBundleRework 
Syndicate Bundles - Increased overall value and added a new bundle
 2019-01-18 18:04:59 +08:00
Kyep
61e888cd2b adjusts experimental KA 2019-01-10 14:40:24 -08:00
AzuleUtama
25ee0ddade Syndie Bundle Rework 2019-01-10 19:23:47 +00:00
variableundefined
a1f9a19fe2 Merge pull request #10557 from datlo/clownwiz 
Adds the Staff of Slipping and Clown wizard outfit
 2019-01-09 17:59:08 +08:00
Kyep
bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
variableundefined
18881b2592 Merge pull request #10595 from AzuleUtama/caneDartChange 
Mime's Cane Shotgun ammo reworked and buffed
 2019-01-06 16:19:15 +08:00
AzuleUtama
fb052938c8 Cane shotgun darts more effective + other changes 2019-01-05 01:41:39 +00:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
datlo
c37b22c00b replace placeholder sprite 
oops
 2019-01-01 21:23:41 +00:00
datlo
5b92bdd66d Add staff of slipping (placeholder sprites) 2018-12-30 16:54:16 +00:00
joep van der velden
1b5322c32e Refactor a few small things to make my research level parser work and make the code less odd 2018-12-30 15:18:00 +01:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
variableundefined
07769ba3b9 Merge pull request #10438 from Aurorablade/BirdisnotbirdisnotBIRD 
Trying to Diagnose rsc issues
 2018-12-12 13:28:55 +08:00
AzuleUtama
8284c56c54 Fixes bulldog and c20's low ammo alarms only going off once 2018-12-12 00:28:45 +00:00
Aurorablade
87f3a7c1b3 Caseing 2018-12-10 21:52:10 -05:00
lass9030
b4914464d7 action icon 2018-12-09 15:08:29 +01:00
Granodd
c33f03b920 Removes casing sound from removing chambered round 2018-12-04 13:00:30 -05:00
Granodd
b33eebfc3f keeping the code consistent (forgot a return) 2018-12-02 21:22:54 -05:00
Granodd
8fb45039c0 moved attackby proc to projectiles/guns/projectile.dm 2018-12-02 21:10:20 -05:00
Granodd
0a84835c84 removes some unneeded code for a future PR 2018-12-02 04:38:26 -05:00
Granodd
9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
datlo
2c3541b95f Fix a couple of finger gun issues 2018-11-25 19:04:53 +00:00
datlo
a80efa4924 Add the advanced mimery kit to mime uplinks 
Also adds :
Mime specific spellbooks
TG wizard forcewall (mime is a subtype, will implement for wiz later
probably)
Fake finger gun spellbook in arcade
 2018-11-23 07:23:34 +00:00
TDSSS
92991726ec Moved silencers, gave them their own folder 2018-11-19 09:52:25 +01:00
AzuleUtama
e2c81535f0 X-ray laser nerf - Falloff and Charge 
See here for the main reasoning behind the PR -
https://nanotrasen.se/forum/topic/14790-wanted-unwanted-features-refactors-bugfixes-thread/
 2018-11-14 21:12:52 +00:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
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