Commit Graph

1379 Commits

Author SHA1 Message Date
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Cheridan
065807eca8 Merge pull request #12986 from Yolopanther12/master
Adding Clonepod to Supply Blacklist, Fixes #12979
2015-11-13 08:29:20 -06:00
Cheridan
74529129ed Merge pull request #12984 from tkdrg/replaceTHIS
Fixes cargo manifest access restriction display
2015-11-12 23:54:45 -06:00
Yolopanther
d2bb41d581 Missnig Comma
Hey I found that comma that makes it all work. Should compile now.
2015-11-11 21:51:58 -08:00
Yolopanther
319b57004c Adding Clonepod to Supply Blacklist
Added clonepod to the supply shuttle blacklist, fixing issue #12979
2015-11-11 21:45:07 -08:00
Tkdrg
236e5cf86b Fixes cargo manifest access restriction display
Why use replacetext with no arguments? I have no idea.
This wasn't runtiming because of the bygex stuff I guess.
Thanks octareroon91 for reporting this to me ingame.
2015-11-12 02:14:35 -03:00
phil235
7af0715f7d Fixes Escape Shuttle sound being too loud. 2015-11-11 21:55:21 +01:00
duncathan salt
15c7d1f356 Merge pull request #12743 from Xhuis/maybe_theyll_find_out_where_the_other_sound_came_from_too
Causes the emergency shuttle to play sounds upon launch and dock
2015-11-11 10:25:37 -06:00
Tkdrg
8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
Xhuis
196a697f5a c 2015-11-04 21:27:44 -05:00
Xhuis
e553447f65 More optimization 2015-11-04 21:26:47 -05:00
Xhuis
2199d7c4d1 Makes sounds more optimized (I guess...) 2015-11-04 21:25:12 -05:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
Kyle Spier-Swenson
d704f37480 Fixes indenting in EquipRank 2015-11-01 12:56:02 -08:00
Kyle Spier-Swenson
7b0a04e28f Makes round start spawn code more robust
For finding a spawn point, it will now use this logic to find a spawn point, stopping at the first one it finds

Empty job spawn point
Filled up job spawn point (spawning them on top of eachother if it can't find enough spawn points)
Late join spawn point
Random tile in the arrivals shuttle area.

If it hits either of those two final points it will pop a message in the runtime log.
2015-11-01 12:29:28 -08:00
MrStonedOne
8c755da84f Adds a way to make certain area/space areas not force 100% brightness 2015-10-31 02:30:49 -07:00
Xhuis
ade342d2c4 Adds new sounds, courtesy of Cuboos 2015-10-30 17:24:18 -04:00
Xhuis
35041034d9 Hyperdrive sounds 2015-10-29 22:38:35 -04:00
MrStonedOne
4f652da4bd Adds a config option for the round end restart delay.
This should enable more murder death kill at round end before the next round starts.
New servers will default to 90 seconds while old servers will default to the old 25 seconds until they import the config option to their server.
2015-10-26 05:04:43 -07:00
Vincent
de68ad1085 Security officer scaling is altered.
Previously, security officer scaling was between 5-12 no matter what was configured.
Now, security officers will have (spawn positions)-12 spawn and total position slots.
This can be set in jobs.txt or admin set through the jobs controller while in the lobby.
This is only used when officer scaling is set.

Also, the number of extra security equipment closets spawned is relative to the number of total job positions configured, with or without officer scaling.  Previously if officer scaling was not set, no additional closets could spawn.

Adds myself to admins.txt after like 3 years of contributing
2015-10-24 21:05:06 -04:00
Vincent
3e6f641ec3 Should fix loading from jobs.txt
The jobs controller's list of occupations was reset during roundstart which completely undid that whole load from file thing.  It also would have undone any admin edits done while sitting in the lobby.

Also fixed a couple instances where people thought that lists get copied with the = operator instead of passing by reference.
2015-10-24 19:46:44 -04:00
Jordie0608
8281e505ff bird and discstation pass, replaces z2 airlocks with poddoors 2015-10-18 01:52:22 +11:00
Jordie0608
cea729db60 Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen 2015-10-16 01:14:17 +11:00
Jordie0608
b919eed9cc pass for metastation, code improvement 2015-10-15 19:06:53 +11:00
Jordie0608
69a6c82654 station placed shuttles demonstration 2015-10-13 21:49:52 +11:00
Kyle Spier-Swenson
d2327bd06f Fixes automatic map change causing lag
It would lock up the MC for 30 seconds while it was compiling, meanwhile ticks are queuing.

After the map was compiled, there would be 15 mob ticks, 15 object subsystem ticks, 15 mechinery ticks, 60 atmo ticks, etc all queued up and would attempt to fire all at once.
2015-10-12 19:29:29 -07:00
phil235
9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
Razharas
87f2cbf4ed Merge pull request #12218 from phil235/BugFixBoogalooA
Fixes critical bug causing multiple hits from single projectile.
2015-10-09 12:41:08 +03:00
Remie Richards
97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards
b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Razharas
e3065b1643 Merge pull request #12164 from Aranclanos/crewmonitor
Changes map generation time at roundstart
2015-10-07 22:17:11 +03:00
phil235
dbaba791f3 Fixes critical bug causing multiple hits from single projectile.
Fixes some other potential issues coming from changing a few del() to qdel().
Fixes not being able to shoot mob on same tile as the shooter.
Fixes being able to shoot oneself by simply clicking our mob.
Fixes not being able to shoot non human mobs right next to us.
2015-10-07 20:57:36 +02:00
Razharas
0ad7257a52 Merge pull request #12089 from MrStonedOne/maprotation
HOLY FUCKING SHIT, I'VE DONE IT! Map rotation!
2015-10-07 07:53:42 +03:00
duncathan
e2ed83b6a5 adds the del() log to world.log at roundend and allows the runtime condenser to parse and condense it 2015-10-05 18:52:44 -06:00
Aranclanos
ff451025ed Moves the minimap generation to the initialization list, instead of being calculated after it.
Removes the spawn from it too.
2015-10-04 22:09:17 -03:00
MrStonedOne
29cf9bd265 Some map rotation tweaks.
Adds a config option for the map rotation chance.
Ups default rotation chance from 50% of round length to 75% of round length.
Moves the procs around.
Adds two new admin verbs:
Force map rotation.
Change map.
2015-10-02 10:48:09 -07:00
MrStonedOne
a6e189a873 Removes unused force var from map rotate proc 2015-10-01 04:11:21 -07:00
MrStonedOne
fb01e5ce71 Cleans up map rotation code, removes debugging code 2015-09-30 08:43:22 -07:00
MrStonedOne
fcc8402f31 map rotation base code 2015-09-30 07:13:38 -07:00
Shadowlight213
3c26e4c843 I'm an idiot. Remember to compile for every change kids! 2015-09-28 02:19:57 -07:00
Shadowlight213
846a7bb1a2 Adds telepads to the blacklist 2015-09-28 01:31:53 -07:00
Remie Richards
131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards
58483beb50 Hand of god gamemode!
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
Shadowlight213
5fd5b36c42 Adds teleport station and hub to cargo shuttle blacklist 2015-09-27 00:42:33 -07:00
AnturK
50db063df9 Event Fix 2015-09-24 12:29:25 +02:00
Razharas
835da91620 Merge pull request #11883 from phil235/DnaMonkeyStuff
DNA rework
2015-09-22 18:43:27 +03:00
AnturK
ce91984464 Fixes alien infestation. 2015-09-20 16:39:23 +02:00
phil235
6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm
2015-09-19 22:34:30 +02:00
phil235
f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
Swag McYolosteinen
9e24350297 Merge pull request #11593 from AnturK/misc
Abductor QoL & Event
2015-09-17 19:25:38 +02:00