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
Ionward
e347ae8dfe
a little more than a touchup, includes: grey fit backpacks + uniforms and fixes associated, drask glasses and masks, and a version of the god eyes for drask grey and vox
2019-08-19 18:34:37 -07:00
Crazy Lemon and GitHub
3313efed23
Merge pull request #11981 from Fox-McCloud/lavaland-update
...
Major Lavaland Update
2019-08-16 22:22:49 -06:00
AzuleUtama
30b526f40c
Update briefcase.dm
2019-08-15 19:17:24 +01:00
variableundefined and GitHub
34bb102a37
Merge pull request #11767 from Arkatos1/pillbottle
...
New Medical Directive - Colored Pillbottles!
2019-08-15 11:17:46 +08:00
variableundefined and GitHub
9097eb0e1d
Merge pull request #11741 from AzuleUtama/chameleonGlasses
...
Traitor thermals and security HUD now use updated chameleon code, Slight buff to the thermals
2019-08-13 12:06:39 +08:00
AzuleUtama
f550b19f8d
conflicts and reviews
2019-08-12 19:04:21 +01:00
Arkatos1
bddc7132c2
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-08-12 16:36:43 +02:00
Fox McCloud
ee0447dad6
Major Lavaland Update
2019-08-10 22:36:55 -04:00
Couls
6ee8c0d96f
Merge remote-tracking branch 'upstream/master' into zombies
2019-08-04 21:05:10 -04:00
Kyep
fd389810f2
medals in lockers
2019-07-10 20:13:14 -07:00
Arkatos1
de9da04572
Standardized colors, finished change wrapper choosing and modified templates and their sizes
2019-06-30 19:46:13 +02:00
Arkatos1
16a81d2527
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-06-30 16:09:38 +02:00
Arkatos1
d33d018e62
Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster
2019-06-30 16:08:33 +02: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
62af5597d3
Merge remote-tracking branch 'upstream/master'
2019-06-29 15:10:27 +01:00
AzuleUtama
3c5cf391b3
Ports false-bottomed briefcase from VG
2019-06-27 08:53:08 +01:00
AzuleUtama
9500df95d3
Traitor thermals and security HUD now use chameleon code
2019-06-22 14:06:07 +01:00
Improvedname
24c2b0fd4f
j
2019-06-10 19:53:03 +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
variableundefined and GitHub
3acf995a76
Merge pull request #11466 from Markolie/bundles
...
Species chameleon fix
2019-05-28 10:53:17 +08:00
variableundefined and GitHub
3dae8eded3
Merge pull request #11430 from Markolie/actual_bundles
...
[DNM] Uplink bundle rebalance
2019-05-27 23:05:46 +08:00
Mark van Alphen
ec70c2512d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles
...
# Conflicts:
# code/modules/clothing/masks/breath.dm
# code/modules/clothing/masks/gasmask.dm
2019-05-23 18:56:25 +02:00
Mark van Alphen
2c5e216e82
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# paradise.dme
2019-05-17 17:37:18 +02:00
variableundefined and GitHub
3338d8b907
Merge pull request #11476 from Arkatos1/inhand
...
New inhand sprites
2019-05-17 19:17:32 +08:00
Couls
8083b51a96
Initial commit
2019-05-16 22:36:30 -04:00
Mark van Alphen
0f98a95666
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-13 22:14:38 +02:00
Mark van Alphen
acbf627f8c
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles
...
# Conflicts:
# code/modules/clothing/glasses/glasses.dm
# code/modules/customitems/item_defines.dm
2019-05-13 22:08:49 +02:00
AffectedArc07
510c210930
Merge
2019-05-09 17:06:35 +01:00
Mark van Alphen
2618def9a1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/Delta/delta.dmm
# _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
# _maps/map_files/MetaStation/z4.dmm
# _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
# _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
# _maps/map_files/RandomZLevels/spacebattle.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
# _maps/map_files/cyberiad/z4.dmm
# _maps/map_files/cyberiad/z6.dmm
# _maps/map_files/generic/z5.dmm
# code/__DEFINES/misc.dm
# code/__HELPERS/unsorted.dm
# code/game/objects/structures/lattice.dm
# code/game/turfs/space/space.dm
# code/modules/mob/mob.dm
# code/modules/ruins/ruin_areas.dm
# paradise.dme
2019-05-08 21:40:35 +02:00
Arkatos1
b2e7149f1d
Adds new inhand sprites
2019-05-06 16:08:38 +02:00
Mark van Alphen
90f71f164a
Remove unused species_fit and move chameleon file
2019-05-05 20:37:53 +02:00
Mark van Alphen
d98eb14a39
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
# code/modules/shuttle/shuttle.dm
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-04 03:16:38 +02:00
Mark van Alphen
f3fb39b339
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
variableundefined and GitHub
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
Mark van Alphen
35b1cee88b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/obj/toy.dmi
2019-05-03 18:31:45 +02:00
Mark van Alphen
d646ab0934
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/game/area/Space Station 13 areas.dm
2019-05-03 18:30:07 +02:00
variableundefined and GitHub
8928210da1
Merge pull request #11425 from Arkatos1/delay
...
Examine tooltips tweaks
2019-05-03 22:48:15 +08:00
Mark van Alphen
eac4f841ce
Switch to penetrator/sopo rounds only
2019-05-02 01:39:11 +02:00
Mark van Alphen
b3d7681a4a
Discord feedback on bundles
2019-05-01 22:24:51 +02:00
Mark van Alphen
5216106192
Uplink kit rebalance
2019-05-01 21:35:56 +02:00
Mark van Alphen
86b90bab2c
And fix the uplink kits
2019-05-01 21:01:16 +02:00
Mark van Alphen
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
Arkatos1
24b0eb0c0c
toolbelt update
2019-05-01 16:57:54 +02:00
Arkatos1
c6a91eafdd
Tweaks
2019-05-01 16:04:07 +02:00
Arkatos1
791bebf51c
Tweaks to Examine tooltips
2019-05-01 15:50:30 +02:00
Arkatos1
e6dca3ffa1
Colored pillbottles
2019-04-30 19:34:22 +02:00
AffectedArc07
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
KasparoVy