Commit Graph

78 Commits

Author SHA1 Message Date
paprka
726b939754 whole bunch of gun stuff 2014-08-07 14:39:31 -07:00
paprka
d41a469ff4 Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
Conflicts:
	code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
Jordie0608
b2641f9af6 Adds away missions to readme.md 2014-07-31 21:54:55 +10:00
paprka
d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -07:00
CollenN
2aab5fa71c Finalizes Mutantrace Datum Update
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
ikarrus
4905beb67e Removes hacky code in favour of a process() check for the nuke disk's location
Instead of having a lot of hacky checks to prevent the disk from leaving the Z-level, it will be checked periodically by process() if Z > 2
2014-05-30 22:01:20 -06:00
Cheridan
18ebcc0e45 Merge pull request #3720 from hornygranny/readingrainbow
carved books now turn into storage items
2014-05-21 22:16:45 -05:00
Hornygranny
d0015287de carved books now turn into storage items 2014-05-16 14:30:04 -07:00
ikarrus
56d5412e50 Merge branch 'master' of https://github.com/tgstation/-tg-station into announcements 2014-05-14 08:34:49 -06:00
ikarrus
a48ba0d256 Priority Announcement Changes
-Centcom announcement proc merged with generic priority announcement proc
-Re-added the Captain Announces accompanied by a new pleasant sound, instead of the generic priority announcement
-Captain Announcements will automatically generate a newscaster article
-Priority announcements without any defined accompanying sound will play a generic "Attention" soundbyte as an audio cue
-Communications consoles will display who is currently logged in
2014-05-05 22:18:57 -06:00
Aranclanos
b544a945a9 Fixes issue #2489
Fixes issue #119

Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
Daniel
30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Razharas
6cb3ae5183 Revert "Merge pull request #3142 from Alek2ander/master"
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
2014-03-29 18:02:54 +04:00
Alek2ander
8fa4005c24 Moved paicard check to /obj/machinery/computer
BSA control computer now a valid pAI control target. !!FUN!!
2014-03-27 23:43:05 +04: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
6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
Robson Richards
49e0cbd125 Reworked arguments to suit new GetTypeInAllContents 2014-03-07 21:06:46 +00:00
MrPerson
1ff2cd3e92 Somehow the box away code file got unticked. 2014-03-03 05:47:17 -08:00
MrPerson
917a2dd2a4 Rename equip_to_slot_or_qdel() -> del()
Still qdel()'s them, just naming the proc back.
Should hopefully reduce the number of lines different in the pr.
2014-03-02 21:08:25 -08: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
Robson Richards
5ab63eb3ab Swapped a for loop for a Recursive checking proc. 2014-02-23 15:59:31 +00:00
Robson Richards
e435edc04e Prevents the Nuke disk from going through the Gateway 2014-02-23 02:46:40 +00:00
Aranclanos
e5ba65bb78 Removes the away mission box2550 2014-02-19 06:53:15 -03:00
Tenebrosity
094c91dc49 Readds slime and AI corpse to box away
They now appear correctly, and without interfering with other parts of
the game.

Fixes turrets and their turnie offie things so they work.

Still to do: Readd window clue to bomb test area. Somehow it got removed
from the object's description.
2014-02-05 06:39:05 +13:00
Razharas
a6157132b5 Merge pull request #2569 from Tenebrosity/box2550Away-update
Makes box2550away unsimulated and more
2014-02-03 23:34:45 -08:00
Tenebrosity
fd8be7edc2 Updates box2550away (again) (again) (again)
Uses the map tools, but edits a lot of paths.

Makes box2550away unsimulated to combat lag
Adds three new unsimulated floors, which are just copies of simulated
ones
Adds four new unsimluated walls, which are just copies of simulated ones
Breaks telescreens as they don't work off the station
Adds the escape shuttle to the map as it has the penultimate HONK clue
paper on it and replaces the shuttle console with a fake
Adds a needed stat check to security camera computers
Gets rid of disposal overlays on box2550away toilets
Replaces box2550away status displays with fakes
Fixes a bug with entertainment monitors where they had no broken icon
due to being in status_display.dmi instead of stationobjs.dmi
Adds a carpet icon ("carpet2") that was present in 2010 and is used in
box2550away back to floors.dmi
Changes disposal related user messages so they refer to the name var of
the disposal object. This makes the messages refer to my disposal
toilets as toilets instead of diposals.
Removes the non-slip flag of SWAT shoes in the armoury.

God I hope I committed all the files I changed.
2014-02-04 20:30:13 +13:00
Tenebrosity
e33f91229b Gameticker checks for mind in end of game readout
This stops AI corpses showing up in the end of round report. It also
means that a ghosted (whether after death or by going catatonic) AI or
borg will now have its player shown at the end of the round.
2014-02-03 05:27:03 +13:00
Tenebrosity
bcf075b394 Fixes #2553 and #2533
Fixes the away map dead slime spawner. Previously, it would spawn two
dead slimes that had living icons. Now it spawns one slime with a dead
icon.  These issues are fixed by adding a check for existing slimes at
the spawner's location before spawning a slime, and killing the spawned
slime via adjustToxLoss() instead of death(). Death() doesn't give the
slime a dead icon for some reason.

Fixes the away map dead AI spawner. Previously, it spawned a dead AI
that showed on the PDA messenger from roundstart, made the AI status
displays on the station show the BSoD, and displayed its laws in the
round-end report. These issues are fixed by setting the spawned AI's PDA
toggle to 1, changing the status displays back to blank after the AI
dies and removing the dead AI from the moblist so it isn't shown at the
end of the game.
2014-01-31 00:47:44 +13:00
Pete Goodfellow
9a8edff524 Merge fix. Updated to MetaStation.v39B.II.dmm 2014-01-21 21:57:10 +00:00
Pete Goodfellow
d80719c330 Merge branch 'tg-mapchange' of github.com:Mloc/-tg-station into mapsss
Conflicts:
	_maps/RandomZLevels/fileList.txt
	_maps/map_files/MetaStation.v39A.III.dmm
	maps/MetaStation.v39A.III.dmm
	maps/MetaStation.v39B.II.dmm
	tgstation.dme
2014-01-21 21:50:32 +00:00
Miauw
6704a9948d Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-16 19:46:04 +01:00
Jesus Hussein Chris
245dc52833 Removes unneeded code as pointed out by Cheridan. Thanks for the help. 2014-01-14 21:30:35 +13:00
Tenebrosity
73005ca982 Hopefully fixes Giacom's complaints 2014-01-14 13:18:13 +13:00
Mloc-Argent
2f931aefc8 Big(gish) map reorganization.
Moved all main .dmm maps to _maps/map_files
Each main map gets a .dm file in _maps, this is what's ticked, -NOT- the .dmm file.
This allows use of a MAP_NAME define for various purposes, and lays the groundwork for map customization in the future.

Also included a hacky dm.sh script which supports swapping maps.
For example, "./dm.sh tgstation.dme -Mmetastation" would compile with metastation.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-13 22:38:11 +00:00
Jesus Hussein Chris
7d309d56ff Adds the ability to spawn dead AIs, dead facehuggers and dead slimes on away mission maps. Expands on dead human spawning. 2014-01-13 12:37:18 +13:00
KazeEspada
4b52884913 Fixes a potential issue with lootspawners who have lootcounts longer than their loot list and lootdoubles not enabled. 2013-12-04 18:10:43 -07:00
Cheridan
637e7f72c9 Nuke Op Population Scaling and Content Update
to be edited
2013-11-03 16:41:57 -06:00
Cheridan
7506a19073 Nuke Op Gloves: The Blackening
-Removes the yellow gloves on the Nuke Ops shuttle. (They were completely redundant, as the gloves they start with were already insulated (!!!)).
-In return, adds a laundry room to the nuke ops staging area, allowing them to paint their gloves as they please if they want to be stealthy.
-Removes 'SWAT' gloves in favor of the less-weirdly-specific combat gloves. Codewise, they were exactly the same.

Updates spacebattle.dmm, as it had an instance of swat gloves.
Adds a link in the mapmerge tool instructions to assist in setup.
2013-10-20 23:09:22 -05:00
Aranclanos
90b894fe66 Made all the machinery use ..() on the Topic(), instead of having a copy pasta everywhere to see if the human is dead or others. This will stop dead AIs interacting with machineries or others. 2013-07-03 13:16:53 -03:00
Ikarrus
1518d285e7 Standardized spelling of all instances of "Centcom"
Centcomm/CentComm -> Centcom
centcomm -> centcom
2013-06-17 20:49:01 -06:00
carnie
043028db83 Resolves #283
DNA modification uses normally distributed random numbers. Radiation strength dictates the standard deviation of the change in the hex character which is hit (higher output means greater chance for a large change) . Similarly, radiation duration dictates how likely we are to hit the hex-character we clicked on (longer duration means more likely to hit). Irradiation is strength*duration. All balancing is done via multiplier defines so you can rebalance it easily.

DNA blocks and structuring all use defines. Making modification/expansion easier. I'll likely expand this into a datum-based system to allow more interesting features, reduce code further and allow admins to interact with the way dna strings behave.

DNA strings can be spliced together using merge_text().
 e.g. string 1: "Hello World"
 string 2: "Seeya______"
 result: "Seeya World"
 This isn't used except for admin-spawnable SE injectors at the moment.

r_hair, g_hair, b_hair, r_facial, g_facial, b_facial, r_eyes, g_eyes, b_eyes were removed and made into 3 short hex-colors.

Skin tones now support colours other than shades of brown. I've had to restrict it heavily until other stuff is done. Skin tones include Albino Caucasian, Oriental, Mediterranean, etc.

Data disks and DNA injectors were reworked to use associative lists so transferring data is just a matter of doing list.Copy()

var/dna is now defined at /mob/living/carbon level. Only monkeys and humans may have dna currently. Support is there for all carbon-based lifeforms to have dna.

DNA modifier console has almost all controls on one screen.

UIs and UEs can be injected separately (appearance and name, respectively)

dna helper procs like ready_dna() and such were changed to make them more versatile. There is now a hardset_dna() proc as an alternative to ready_dna which can initialize dna with properties passed into it or update an existing dna string (useful for cloning and antag spawning)

Every block of SEs are in randomised positions.

Disabled automatic logging of world.log, as it produced undesirable behaviour.

Mr Muggles and God Emperor of Mankind disks removed.

Floor() removed. (it was completely uneccesary, that is what round() is).

Fixed spelling mistakes in modularchangling.dm (thanks tenebrosity)

Tanning removed from beaches (again)

Experimental: monkeys and humans do not have dna until first attempt to read dna (using check_dna_integrity(mob))
This is mainly due to the way everything is hardcoded into New().

Changelog.html updated
Signed-off-by: carnie <elly1989@rocketmail.com>
2013-04-24 09:37:30 +01: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
petethegoat@gmail.com
3acc1f7899 Standardised a lot of implant code.
Added logging for tracking implant messages. (hurr sekrit erp)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5699 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-13 16:44:54 +00:00
petethegoat@gmail.com
3c02e14efd Fixes issue 1179. If gravity is off, can't escape trash chutes
Fixes issue 1219. Cloning Scanner Popping Out Prematurely
Fixes issue 1182. Using wrapping paper on a bodybag
Fixes issue 1238. Reading while blind (fixes paper, photographs, and books)
Fixes issue 1253. Braindead message when converting non braindead people (rev)
Fixes issue 1188. Head revs converting unconscious people

Added is_blind(A) as a helper proc for blindness. It returns 1 if A is a fully blinded carbon mob.

Updated the loot spawner to use a list instead of a text string.

Updated gun reloading to use text styles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5619 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-27 13:20:59 +00:00
petethegoat@gmail.com
f363948dc6 Committing some of SuperSayu's misc patches: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11671
* Smart fridge smartly shows (x5)(x10)(x25)(All) vend options based on quantity stored
* Gateway fix: When the away mission gate is calibrated, you will come out facing south. Matters somewhat when walking through in an exosuit. Also one pedantic text edit.
* Drink volume estimation:
* * Moved "half-full" to 26%-66% rather than 25%-49%
* * Moved "almost full" to 67%-90% rather than 50%-111% (1/.9)

Also removed /obj/item/weapon/directions and /obj/item/weapon/paperscrap.
They've been replaced by /obj/item/weapon/paper/crumpled and /obj/item/weapon/paper/crumpled/bloody.
Updated 2.1.0 and all away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5497 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 20:58:31 +00:00
baloh.matevz@gmail.com
0a1b16f620 - Moved access definitions for jobs to the job datum. In addition, I added an extra access definition: minimal_access and access. Minimal access is intended for servers with large populations. All jobs have the bare minimum access they need to survive. access, on the other hand, is a far more generous list of accesses, intended for servers with lower populations, where players are expected to do more than just the job they were assigned. Also for servers which don't want to allow people to hide in their own ultra secure departments, where no one can get to them.
I did not go through the list to assign 'access' yet, so the two are currently identical.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5479 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-06 16:38:45 +00:00
ericgfwong@hotmail.com
f7abe34c72 Removed mining department radio frequency. Miners and Cargo techs will all be under the Cargo radio instead.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5265 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-05 23:27:10 +00:00
ericgfwong@hotmail.com
136800a071 Swapped the locations of the Vault and Tech Storage.
Cargo Techs, Miners, and Roboticists no longer start with gloves. Instead, a limited number of gloves have been added to each of their departments.

Shuttle Brig now requires Holding Cell access
Janitor given a pair of latex gloves
Red pen added to Warden's office by request


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5238 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-01 01:03:15 +00:00
Kortgstation@gmail.com
afe9e93c05 Fixed name of the medical rig
Fixed the exile implant locker.

Made syndicate simple animals slightly squishier (block chance lowered).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5160 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 08:15:07 +00:00
Kortgstation@gmail.com
8fcff0ac65 Updated the faithless health/damage and the wildwest map to have rig suits on the miner corpses. I'd already edited this locally on the /tg/station servers, so our players shouldn't notice any difference.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5150 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 14:25:30 +00:00