defbf5b6df
Lizard skin handbag ( #13477 )
...
* lizard handbag crafting recipe
* lizard handbag item
* lizard handbag sprites
* Fix styling of skin recipes
2020-05-24 14:07:41 -04:00
04ba5c1cc9
File standardisation ( #13131 )
...
* Adds the check components
* Adds in trailing newlines
* Converts all CRLF to LF
* Post merge EOF
* Post merge line endings
* Final commit
2020-03-17 18:08:51 -04:00
d8a934381c
Merge pull request #12854 from Darkmight9/ERT_and_Dsquad_bag_space
...
Increases bag space of ERTs and death squads
2020-03-08 03:34:23 -04:00
c9bc00f654
grammar errors
2020-03-04 14:52:40 +08:00
b43f41ee47
making sure Rapaskoti's new icons work, and coding what they wanted to do.
...
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com >
2020-03-04 14:27:41 +08:00
8f297aa4d0
Merge pull request #12683 from MarsM0nd/order_conscription_kit
...
Brings orderable conscription kit in line.
2020-02-24 19:48:46 -05:00
5ca4ea4025
Removed unneeded New procs
2020-02-07 20:38:09 +01:00
fd913498bf
Make every obj/.../New() call it's parents
2020-01-29 10:43:32 +01:00
c5ee1c68dd
Increases bag space of ERTs and death squads
2019-12-27 18:59:07 -05:00
f2f7ec956a
Orderable conscription kit only without ID
2019-10-31 15:43:35 +01:00
2224229fad
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-30 14:18:33 -04:00
e02a76aa73
Fixes too many items in the conscription kit #12436
2019-09-29 19:41:07 -07:00
9097dfcacf
Merge remote-tracking branch 'upstream/master' into universal-damage
...
# Conflicts:
# code/game/machinery/machinery.dm
# code/game/objects/items.dm
# code/game/objects/structures.dm
# code/game/objects/structures/inflatable.dm
# code/game/objects/structures/mirror.dm
# code/modules/clothing/spacesuits/hardsuit.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/mob/living/carbon/alien/alien_defense.dm
# code/modules/mob/living/carbon/slime/slime.dm
# code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
8b87bd529c
Slight refactor of conscription kit
2019-09-27 17:44:06 +02:00
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
788f1926fb
though-our-bodies-be-ravaged
2019-09-15 19:49:52 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
c6d846b6b6
Nuclear Operative Item Tweaks
2019-09-11 21:25:44 +01:00
f998cb74ad
then-we-shall-reforge-the-armor-from-what-remains
2019-09-10 07:03:05 -04:00
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
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
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
9500df95d3
Traitor thermals and security HUD now use chameleon code
2019-06-22 14:06:07 +01:00
24c2b0fd4f
j
2019-06-10 19:53:03 +02:00
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
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
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
b2e7149f1d
Adds new inhand sprites
2019-05-06 16:08:38 +02:00
90f71f164a
Remove unused species_fit and move chameleon file
2019-05-05 20:37:53 +02:00
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
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
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
f63b587f54
Nuke ops updates
2019-04-07 21:57:22 +02:00
9f5b3fc796
updates
2019-04-02 20:26:23 +01:00
29aa1ccef7
Removed MMI from surgery bag, made it Roboticist only
2019-03-18 20:22:38 +00:00
d61fa732f3
Allows Leather Satchel Strap Switching
2019-02-08 16:46:07 -05:00
a57e5b1cc8
improved logic
2019-01-17 21:39:56 +00:00
32cacc95ad
Removal of "The"
2019-01-17 00:09:27 +00:00
ad8c1f11cd
Examining backpacks now gives a rough indication of remaining space
2019-01-16 19:51:47 +00:00
61c0f71cce
Replaces uplink management by automated sharing
...
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
e204fd6638
Clarifies BoH/BoH warning
2018-12-08 19:44:28 -08:00
152a350538
Deconflict
2018-10-19 16:07:04 +08:00
ac5cc480b9
Adds the Honk Brand Infiltration Kit
...
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
309e3b04f6
Clears up some relative pathing part 1
2018-10-10 23:39:34 +08:00
919bd7aaf2
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
0382afcb33
Ports TG Components
2018-04-21 01:22:50 -04:00
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
ZomgPonies