Commit Graph

85 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
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
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
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02: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
Mark van Alphen
f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
CornMyCob
9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
AzuleUtama
29aa1ccef7 Removed MMI from surgery bag, made it Roboticist only 2019-03-18 20:22:38 +00:00
Fox McCloud
d61fa732f3 Allows Leather Satchel Strap Switching 2019-02-08 16:46:07 -05:00
AzuleUtama
a57e5b1cc8 improved logic 2019-01-17 21:39:56 +00:00
AzuleUtama
32cacc95ad Removal of "The" 2019-01-17 00:09:27 +00:00
AzuleUtama
ad8c1f11cd Examining backpacks now gives a rough indication of remaining space 2019-01-16 19:51:47 +00:00
datlo
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
Kyep
e204fd6638 Clarifies BoH/BoH warning 2018-12-08 19:44:28 -08:00
variableundefined
152a350538 Deconflict 2018-10-19 16:07:04 +08:00
datlo
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
variableundefined
309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
IK3I
e9f3ee5cf5 No. 2018-03-13 22:48:23 -05:00
taukausanake
ee9e662179 Atmospherics duffel bag and duffel edits
Creates a new duffel bag for Atmospherics. It is a resprite of the Engineering bag with light blue lines on it and a dark blue strap.
Also adds colored strips to each of the Medical duffels (Chem, Gene, Viro) as well as to Toxins as they seemed a little lacking in their special color. Can undo if desired as they are different from before but the same between all sprite types.

In-hand and on-mob sprites have been updated accordingly. Atmos duffel bag spawns in Atmospherics "technician's locker". There was also a missing toxins duffel bag icon for both in-hand DMIs while each other bag had one so I made those too.
2017-07-06 02:13:54 -05:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Mark van Alphen
cef5626f85 Merge branch 'master' into findnreplace 2017-03-09 17:32:42 +01:00
Markolie
3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Mars
52b15a8f35 Small sprite fix
Gives the grey satchel the grey satchel sprite instead of the leather
one.
2017-03-04 19:36:30 +01:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Chakirski
6dca3112b3 The fact this is inconsistent hurts me. 2016-08-04 11:29:26 -05:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Taylor Wood
869c13e493 Fixes exploding backpacks 2016-07-29 23:05:59 +01:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Fox McCloud
88a0482d27 Merge pull request #4688 from FreeStylaLT/maintgoodies
Adds a bunch of items to maint, Syndicate contraband included, tweaks probabilities.
2016-07-09 20:51:40 -04:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
FreeStylaLT
5f74dacf6a Adds duct tape, makes everything rarer, adds a new surgery bag to replace the current one, adds regular shoes and black jumpsuits 2016-06-20 01:19:06 +03:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox-McCloud
1af9e77382 Bag of Holding Tweak 2016-03-14 19:02:56 -04:00
KasparoVy
679218b952 Vox-Fitted Back Stuff, Adds Geneticist Duffel, Fixing Typos and Refactoring Back Icon Generation
Using species_fit and sprite_sheets now works properly for items worn on
the back. Previously it was using the item_state name if it existed in
order to generate the on-mob icon, which was wrong. I restructured it to
work the same way as the rest of the icon generation procs.
2016-02-18 14:59:28 -05:00
Regen
7a51db1f2f keep the !!FUN!!, remove !!ACCIDENT!! 2015-12-29 17:58:19 +01:00
Regen
a244b36952 Adds jump to the admin message 2015-12-18 16:24:49 +01:00
Regen
5c891fab41 Makes code look neat-er
Probably smoother as well, idk, I did what tiger asked me
2015-12-18 16:08:37 +01:00
Regen
b26491617f Adds confirmation alert, changes some values 2015-12-17 10:14:03 +01:00