cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 23:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,688 Commits 26 Branches 2 Tags
522390c0b981ca045202ab804ee9eb8a87149d3c
Commit Graph

1364 Commits

Author SHA1 Message Date
Couls
977433af5f Merge remote-tracking branch 'upstream/master' into dual-wielding 2019-08-27 20:11:08 -04:00
variableundefined
b488d9d27e Merge pull request #11989 from Fox-McCloud/diona-refactor 
Diona Rework
 2019-08-27 18:03:47 -04:00
Arkatos1
6b2add6eb9 Deconflict 2019-08-26 18:53:55 +02:00
variableundefined
97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle 
Ports VG's false briefcase
 2019-08-26 08:53:14 -04:00
variableundefined
289b890e76 Merge pull request #12087 from KasparoVy/skrekked_myself_up 
Fixes Bug with Species-fitted Inhand Icons
 2019-08-26 06:40:35 -04:00
KasparoVy
285df0d994 Fixes Inhand Sprite Sheeting Bug 
Caused by #11978, the bug presented where a species that was in the sprite_sheets of an item but didn't have a custom inhand item for it picked up an item like a uniform and suddenly a grey jumpsuit was rendered on them. Happened for Vox when picking up regular uniforms because they have species-specific uniform sprites but not species-specific inhands, so it triggered the conditional and caused silly issues.
 2019-08-25 22:29:16 -04:00
Fox McCloud
b441ae1c8f Merge pull request #12080 from SteelSlayer/L6-fix 
Fixes a bug that prevented you from inserting L6 SAW magazines into the gun
 2019-08-25 18:40:19 -04:00
SteelSlayer
2dbc09f734 who said you could move? get back there 2019-08-25 08:48:20 -04:00
SteelSlayer
205b36feca Fixes not being able to insert mags into the L6 SAW 2019-08-25 01:20:31 -04:00
KasparoVy
ca495b2b9b Adds Sprites for Some Armalis+Vox Gear & Species-fitting Inhand Icons, etc. 
Adds sprites for all Vox & Armalis earwear
Adds sprites for Armalis default backpack, nitrogen tank (non-'emergency' back & belt) all breathmask variations

Fixes an issue where Vox Armalis wouldn't be rendered with the proper in-hand icons for their massive noise cannons.
Fixes an issue where you couldn't species-fit earwear.
Fixes an issue where Vox Armalis couldn't wear the 'Vox' breath mask.
 2019-08-23 22:14:47 -04:00
Fox McCloud
39d0b0b3f5 Merge remote-tracking branch 'upstream/master' into crusher-trophies 2019-08-22 16:28:06 -04:00
Fox McCloud
3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Crazy Lemon
3313efed23 Merge pull request #11981 from Fox-McCloud/lavaland-update 
Major Lavaland Update
 2019-08-16 22:22:49 -06:00
variableundefined
adc33ef3a0 Merge pull request #11783 from Couls/on-hit-effects 
[READY] Add on-hit effects for lasers and bullet holes for walls from TG
 2019-08-16 07:50:49 +08:00
Arkatos1
c9ccf56ebd Merge https://github.com/ParadiseSS13/Paradise into Magic-With-Style 2019-08-12 16:34:52 +02:00
Fox McCloud
0189cd1dee Diona Rework 2019-08-12 01:51:29 -04:00
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
Mark van Alphen
14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
Couls
75ed8566f5 Merge remote-tracking branch 'upstream/master' into on-hit-effects 2019-08-04 21:00:57 -04:00
Couls
fae76166c2 Dual wielding! 2019-07-18 00:05:35 -04:00
Mark van Alphen
88fa0d27df Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-15 20:30:54 +02:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
variableundefined
5c325d33fe Merge pull request #11684 from IAmBigCoat/medbeamwarnings 
Added warnings to the medbeam gun re: stream-crossing
 2019-07-12 18:17:07 +08:00
Mark van Alphen
d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02:00
variableundefined
742bc62c8b Merge pull request #11544 from Arkatos1/recharger 
Rechargers now show their contents and charge status on examine
 2019-07-08 20:18:36 +08:00
Couls
3782dbfc16 Add on-hit effects and bullet holes for walls 2019-07-03 22:17:35 -04:00
AzuleUtama
ab8c0f5aa5 Reverted compact rifle changes, false bottomed case now starts empty 2019-06-30 12:28:23 +01:00
AzuleUtama
fa2ca7c87c Ports VG false bottomed briefcase + compact sniper changes 2019-06-29 15:47:26 +01:00
AzuleUtama
dbed990412 Revert "Ports false-bottomed briefcase from VG" 
This reverts commit 3c5cf391b3.
 2019-06-29 15:10:41 +01:00
AzuleUtama
3c5cf391b3 Ports false-bottomed briefcase from VG 2019-06-27 08:53:08 +01:00
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
IAmBigCoat
8645a0b0ef Added warnings to the medbeam gun re: stream-crossing 2019-06-05 01:49:58 -04:00
Arkatos1
102e27b3c2 Magic with style update 2019-06-04 00:37:42 +02:00
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
Arkatos1
fdd2ca94d4 added get_cell() proc to remaining items using cells 2019-05-18 23:52:18 +02:00
Arkatos1
e000e29b09 rechargers now show their contents and charge status on examine 2019-05-18 19:56:30 +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
09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
CornMyCob
de3d84124a plasma cutter changes 2019-04-05 18:56:20 +01: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
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
Fox McCloud
182177f6eb grammar/wording 2019-02-23 18:17:21 -05:00