Commit Graph

34 Commits

Author SHA1 Message Date
Ergovisavi
5f6cf57e07 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:32:08 -07:00
Ergovisavi
bf83ef4c53 Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag
Nerfs the rag, allows it to be made with the biogenerator, adds a few to the chef/bartender's closets, and to the maint loot spawner
Adds the ability to empty out a fire extinguisher... for sabotage
2015-07-19 04:12:30 -07:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
xxalpha
66e2941531 Adds an empty hugbox for admins to give.
Maintbox

Re-added hugbox to boxstation perma.
2015-07-12 17:44:13 +01:00
Ikarrus
3f21a78ab7 Adds a Hugbox
You can hug it.
2015-07-08 10:30:21 -06:00
phil235
ee13658752 Merge pull request #10018 from pudl/sam
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
Thunder12345
bfb2345726 Moved combat shotguns to shotgun/automatic/combat
- shotgun/automatic/ will pump itself automatically on firing
 - combat shotgun capacity nerfed to 6 rounds
 - replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
pudl
58b436fe1f adds abandoned crates to code, adds crate spawners to code, distributes crate spawners across maps 2015-06-17 09:07:28 -05:00
KyrahAbattoir
d6c0ebdc1b Mapping tool: adds a "structure" spawner that can be used to create "sets" of objects in a turf at runtime rather than having to stack objects in the map editor. Included are two presets for window and rwindow with a "wiring friendly" icon. 2015-06-05 11:39:23 +02:00
Jordie0608
e810855367 reorganizing stray objs in /defines 2015-05-05 21:18:21 +10:00
Iamgoofball
573aea927b Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now. 2015-03-08 16:43:57 -07:00
Iamgoofball
e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
Thunder12345
9f471cb7e4 Reworks fake yellows
Replaces the varedited white gloves in the maint loot spawner list with
a subtype of insulated gloves, with the siemens coefficient changed to 1
and a different desc.
2015-02-16 12:20:06 +00:00
Iamgoofball
f6d7823fc2 Adds muriatic, caustic, and hydrochloride to maint loot 2015-02-05 18:57:58 -08:00
xxalpha
a9c181bbcc Repath all non jetpack tank types to tank/internals
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
2015-02-01 18:25:39 +00:00
Sawu
21edbc1f6f Changes/Fixes/Features to the Experimentor
* Fixes #7224
* Re-fixes #7272
* Adds relics that spawn around the station, can be researched for randomised objects.
* Adds the meteor malfunction.
2015-01-22 14:01:02 +11:00
phil235
b6e35278e3 Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
paprka
e6f88851ac Adds select fire for burst fire weapons 2014-12-14 20:13:09 -08:00
Perakp
3f451f9b1b Warning cones can be worn on your head, with original codersprites. 2014-09-19 22:44:59 +03:00
KyrahAbattoir
20d9e6c2b2 Because aparently we can't have nice things. 2014-09-08 17:26:28 +02:00
KyrahAbattoir
5a928fd7a1 Replaced all the static items in maintenance by random item spawns.
Replaced the numerous "copy paste" racks of meson/firesuit/gasmask piles with proper firefighting lockers.
2014-08-28 13:12:40 +02:00
Swag McYolosteinen
5e696e9cd7 Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot
Dynamic maintenance loot table and map modification.
2014-08-18 19:27:02 +02:00
KyrahAbattoir
7fb2e5351b Removed flash from the maintenance loot table.
set armory_contraband to not spawn duplicates (as it initially was).
2014-08-18 05:41:52 +02:00
KyrahAbattoir
37f9716fb5 Added loot tables for the maintenance and the contraband locker (removed the map edit for now) 2014-08-18 05:40:15 +02:00
ikarrus
be077176ee Used the gibspawner instead 2014-08-16 19:17:39 -06:00
Firecage
22743b77f4 Adds asbolute paths to some effect files. 2014-08-07 18:59:06 +02:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
MrPerson
6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
Aranclanos
fcb3bc66c7 Vaultspawners (those things never used that an admin might once in a blue moon) will now use the ChangeTurf() proc and won't make Linda cry 2014-03-13 22:23:24 -03:00
MrPerson
9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08:00
petethegoat@gmail.com
8ff7285645 Updates HUD stuff!
The main goal was to remove all the pointless shit in the UI style dmis, but this commit actually goes a bit deeper than that.

Formally renames the "hurt" intent to "harm", in line with everything else in the world.

Removes the old screen1_... .dmis. They've been replaced with screen_... .dmis. They function much the same.
screen_gen.dmi is used for things which apply to multiple UI styles, such as storage slot sprites, or the intent selector. (These can still be overridden in HUD code, though.)

Item action buttons have been changed to use a template from the UI style, and the icon_state of the item.
var/icon_action_button has been removed- varvar/action_button_name must be used instead to add action buttons for items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5826 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 21:32:00 +00:00
johnsonmt88@gmail.com
c7947ef236 File restructuring: ohgodihopenothingbroke edition.
All /world/ stuff that I've found is now in code/world.dm instead of being scattered throughout the code in 6-7 files.

*****IMPORTANT*****
This means that hub.dm is now part of world.dm. Server hosts using the hub will likely have to redo the hub/password variables!

Again, that stuff is now located in code/world.dm
*******************

The tester list has been removed as it is not in use.

/code/defines
- Moved atom.dm code into /code/game/atom.dm and atom_movable.dm
- Moved hub.dm code into /code/world.dm
- Moved the /defines/tanning into objects/item/sheets/leather.dm
- Moved /defines/area/ into game/area/
- Moved turf.dm code into the code/game/turfs folder and divided it up into meaningful places

A lot of the files in /code/game were placed in new areas since they really didn't have a reason to be there.
- algorithm.dm: 
- - The world stuff is in world.dm. 
- - countJob() and AutoUpdateTK() were removed entirely (unused).
- - AutoUpdateAI() is now in /mob/living/silicon/ai.dm

- atom_procs.dm was split into atom.dm and atom_movable.dm

- cellautomata.dm
- - World stuff was moved into world.dm
- - Atom stuff was moved into atom.dm and atom_movable.dm
- - Atom verbs were moved into code/game/verbs/atom_verbs.dm

- chemistry.dm
- - Beaker box code was moved into storage/misc.dm
- - The trash can and 'alechemy' paper were removed. (unused)

- Landmarks.dm was moved into /objects/effects/landmarks.dm

- prisonshuttle.dm, specops_shuttle.dm, syndicate_shuttle.dm and syndicate_specops_shuttle.dm have been moved into game/machinery/computer/

- status.dm and topic.dm code were moved into world.dm

- step_triggers.dm are now in objects/effects/step_triggers.dm

- throwing.dm was split into appropriate files (carbon mob code, atom_movable.dm, ect)

- vote.dm is now in code/datums

/code/game/asteroid was split up.
- turf.dm was moved into game/turfs/simulated/asteroid.dm
- artifacts were split up
- - Wish granter is now in game/machinery
- - The stealth box is gone (unused)
- - The list of 'space suprises' was moved into astroid.dm
- asteroid.dm, being the only file left, was moved into /code/game


and finally...
modules/mob/organs files are now in code/datums/organs

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4659 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 22:11:02 +00:00
johnsonmt88@gmail.com
28aabc9810 More file structure stuff!
Cleaned up the files themselves.
Everything in code/game/objects should now be in proper files or places with the exception of the files in the /weapons/ sub-folder.

There's two instances of me not following the exact file structure.
- /obj/item/brain has been moved to a file in mob/living/carbon/brain
- /obj/item/clothing/mask/facehugger has been moved into mob/living/carbon/alien/special
Both of these may not make sense according to the object structure, but they do make sense logically. If it's a problem just move them.

Next up: Finish the files in the weapon folder, then start moving defines down.


My god I hope I havent broken everything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4547 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 03:32:58 +00:00
johnsonmt88@gmail.com
9e30e7d2ec Moving stuff around part 2!
Committing this early to allow pete to commit something involving the .dme file which would probably conflict otherwise.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4514 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-22 16:32:45 +00:00