Commit Graph

317 Commits

Author SHA1 Message Date
Fox-McCloud f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
FalseIncarnate fca3996fcb Cigarette Pack Functionality
Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
2016-01-19 02:49:00 -05:00
Fox-McCloud ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Fox-McCloud a21d1b5221 Uplink and Syndicate Cyborg Fix 2016-01-08 17:07:33 -05:00
TheDZD 6ec065b319 Merge pull request #3102 from Fox-McCloud/ert-fix
ERT Medical Belt Fix
2016-01-03 21:38:15 -05:00
Fox-McCloud dfa55f1f35 ERT Medical Belt Fix 2016-01-03 21:23:49 -05:00
TheDZD cf77645cc7 Merge pull request #2853 from Regen1/Iamsodone
Nerfs the bag of holding + bag of holding effect
2016-01-03 11:34:08 -05:00
Regen 7a51db1f2f keep the !!FUN!!, remove !!ACCIDENT!! 2015-12-29 17:58:19 +01:00
Fox-McCloud 0f03947d55 Ports Elite Syndicate Hardsuit and Uplink Refactor 2015-12-28 08:37:27 -05: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
Fox-McCloud 80e2676e0c medbot fixes and tweaks and features 2015-12-16 00:02:18 -05:00
Fox-McCloud 7a766067ee typo 2015-12-15 22:11:00 -05:00
Fox-McCloud 6105699160 More Medbot Skins 2015-12-15 20:02:29 -05:00
Regen ad5256b788 Fixes and more text 2015-12-15 22:55:27 +01:00
Regen be1a388a6e Nerfs the bag of holding + bag of holding effect
It will now take a small amount of time before creating a singularity,
to warn people around the user, and give people time to stop themselves
in case they missclicked.
2015-12-15 20:38:40 +01:00
TheDZD 55e0ac4507 Merge pull request #2770 from Fox-McCloud/bacpacks-and-stuff
Backpack Fixes and Port
2015-12-08 22:00:50 -05:00
Fox-McCloud 00800803ff Backpack Fixes and Port 2015-12-07 19:11:24 -05:00
Certh 6bdad2a9d9 The examine line of the safe was broken due to w_class being above 5. Tuned it down to 5 (huge item) 2015-12-07 16:33:44 +01:00
Fox-McCloud 0bbd8ea8d2 Botany QoL Changes 2015-11-30 20:03:59 -05:00
Tastyfish 85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
TheDZD 13efd8eeae Merge pull request #2611 from Fox-McCloud/porta-seeder
Re-Adds Portaseeder
2015-11-21 21:27:12 -05:00
Fox-McCloud 3e4059728f Re-Adds Portaseeder 2015-11-20 00:26:51 -05:00
Fox-McCloud edf2bfc4fc Chemistry and Bio-Bags and Xenobio QoL 2015-11-19 20:38:07 -05:00
Robertha89 5c50d20d67 Fixes field surgical kits 2015-11-16 08:51:43 +01:00
Fox-McCloud 318c464f94 Aquarium Starter Kit 2015-11-08 07:38:09 -05:00
Fox-McCloud 2335c6be9d Merge remote-tracking branch 'upstream/master' into barber-update 2015-11-06 06:30:59 -05:00
Fox-McCloud 17112cda3d barber update 2.0 2015-11-05 06:51:00 -05:00
Fox-McCloud 40a5abbb4a Barber Update 2015-11-05 02:04:46 -05:00
Fox-McCloud 4687620436 Adds Random Cigs 2015-11-04 22:47:18 -05:00
Fox-McCloud 9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox-McCloud 4c5706bc3a more...fixes 2015-10-10 08:52:35 -04:00
Fox-McCloud e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Markolie d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Fox-McCloud 444c616d5a Ports NT Station's Belt of Holding Sprite 2015-09-27 23:43:41 -04:00
Mark van Alphen 48a3d1ab9a Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors
Janicart and Janitor Update
2015-09-28 03:02:04 +02:00
Fox-McCloud 569758f4cb bluespace trashbag 2015-09-27 06:46:50 -04:00
Robertha89 495a5bfe31 Death Alarm Implant Kit change
Add's a sixth implant, and removes the implantpad, as it is not needed for deathimplants.
2015-09-26 19:29:48 +02:00
Fox-McCloud b01d49d72c Borg Update: MMI and Suits 2015-09-17 06:50:24 -04:00
Fox-McCloud bef21a964d Merge pull request #2068 from Markolie/lawstate
Welding tool refactor, in-hand updates
2015-09-16 19:07:29 -04:00
Mark van Alphen 02921fea74 Merge pull request #1971 from Regen1/mechweapons
Mech weapons spawn in lockboxes framework
2015-09-16 21:17:27 +02:00
Mark van Alphen d708ee8d84 Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup
Cluster Grenade Cleanup
2015-09-16 20:22:38 +02:00
Markolie 0741669bd6 Implement remove_item_from_storage properly, syndi toolbox tool color update 2015-09-16 01:54:34 +02:00
Markolie 0db98340f8 Further welding tool updates 2015-09-16 01:37:07 +02:00
Markolie 951b58af5a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawstate
Conflicts:
	code/game/objects/items/weapons/tools.dm
2015-09-16 01:32:33 +02:00
Markolie aeabab7248 Welding tool refactor, in-hand updates 2015-09-16 01:27:15 +02:00
Tigercat2000 c562680098 Merge remote-tracking branch 'origin/master' into bay_examine
# Conflicts:
#	code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07:00
Mark van Alphen 1539a4d1e8 Merge pull request #2041 from Fox-McCloud/backpacks
Backpack Storage Rework
2015-09-15 06:58:44 +02:00
Fox-McCloud 1979043d84 Cluster Grenade Cleanup 2015-09-15 00:04:57 -04:00