Commit Graph

11085 Commits

Author SHA1 Message Date
Jon
1a94dea2ea Allows you to define a base turf for an area which overrides the z-level's base turf in unsorted.dm.
It will first check to see if the turf is set, and if not it will still use the z-level default.
This means we can mark areas as having a base of space to override the z-level base of asteroid that we're using.
As a result, we can ensure the bombs, shuttles moving, etc. leave behind an space turf by defining shuttles, solars/"external" areas as using space as a base.
Areas will need to be updated to check with base_turf = /turf/space and references to the old get_base_turf proc updated so all calls (bombs, Nar'Sie, deconstruction, etc.) have the correct effect, but it's tired and I want to commit this now so I'm committed to finishing it tomorrow.
2015-12-03 22:51:15 +00:00
Neerti
42bb4aee39 Merge pull request #398 from Neerti/12/2/2015_round_end_salt_mine
Makes round-end last five minutes instead of one.
2015-12-02 21:04:46 -05:00
Neerti
7d1e3c63ab Merge pull request #399 from MagmaRam/clonerfix
Fixes the bug where cloners would spawn corpses
2015-12-02 17:08:19 -05:00
Merchoven
7f9f6cf8e3 Fixes the bug where cloners would spawn corpses
Cloners spawned new clones with enough brain damage to kill them instantly.
I toned down the brain damage done to fix this.
2015-12-02 13:03:04 -06:00
Neerti
79c5f4a1a8 Makes a line more readable. Thanks GinjaNinja32. 2015-12-02 13:22:14 -05:00
Neerti
b002a75539 Makes round-end last five minutes instead of one, with a per-minute countdown. 2015-12-02 12:32:28 -05:00
Hubblenaut
a0e0f235ab Fixes camera repair 2015-12-02 15:35:27 +01:00
Zuhayr
4d2db18c70 Added a click delay to interactions with the fire axe cabinet. 2015-12-02 20:38:28 +10:30
Zuhayr
7801c2dc3b Minor runtime fixes. 2015-12-02 20:11:31 +10:30
Zuhayr
4fc314bf85 Adds a /prebuilt floor light for use by mappers. 2015-12-02 19:55:15 +10:30
Zuhayr
16c039aadc Fixes reset decals not destroying themselves. 2015-12-02 19:55:07 +10:30
EmperorJon
101f2b227e Merge pull request #377 from EmperorJon/01_Dec._Fix_closet_emagging
Fixes emagging for secure closets
2015-12-01 23:59:33 +00:00
Jon
8986c49b82 Fixes emagging for secure closets. 2015-12-01 23:53:50 +00:00
Zuhayr
1a0eecd09a Runtime fixes. 2015-12-01 18:07:50 -05:00
Neerti
765ac00c6c Merge pull request #367 from Neerti/12/1/2015_armor_refactor
Refactors how armor works.
2015-12-01 04:32:30 -05:00
Neerti
062a092cfe Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike.
Also fixes a bug with the auto shotgun causing runtimes.
2015-12-01 03:45:47 -05:00
Neerti
15aebf8974 Merge pull request #359 from EmperorJon/30_Nov._Fix_AI_door_UI
Fixes #328, maybe temporarily
2015-12-01 00:46:18 -05:00
Neerti
88d090ab34 Merge pull request #353 from Mark9013100/11/29/2015FixesandEdits1
Combination of my previous PRs, mostly fixes
2015-12-01 00:46:12 -05:00
Mark9013100
7a26afb464 Merge branch 'master' into 11/29/2015FixesandEdits1 2015-11-30 23:39:25 -05:00
Datraen
716401fffc Allows people to see through fake walls when opened, removes that when closed. 2015-11-30 17:41:15 -05:00
Datraen
60764d014f Makes fake-walls not air tight once opened. Fake walls continue to not be air tight after being closed. 2015-11-30 17:14:29 -05:00
Jon
539e9fba9a Changes here (https://github.com/Baystation12/Baystation12/pull/11446) were made when adding some sort of hacking tool.
I don't believe we have these changes, but I do know that our UI for AI doesn't currently work(see #328).
A few of the changes made in the linked Baystation Dev change fix our current UI issues. I'll leave it up to Neerti to decide whether we want to work out and pull what's necessary for the hacking tool, but for now this contains the single changes which appear to fix the bug.
2015-11-30 18:11:33 +00:00
Mark9013100
880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
Jon
53cbd2bbe0 Alters the secret player requirements for various game modes:
https://docs.google.com/document/d/1oCuSNmWOhNOzGk9AHmZeVhFPX9Qr0LHSqyxH7ocaXD0/edit
2015-11-28 23:08:11 +00:00
Neerti
710833e7a9 Tries to fix cloning. 2015-11-27 23:17:41 -05:00
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
Neerti
4da0c6b574 Removes world << output, tries to add thanksgiving on the correct date. 2015-11-25 22:19:43 -05:00
Neerti
31e3bd29cc Refactors holiday system slightly. It's now a list based system, so you can have multiple holidays on the same day, in case you wanted to do that.
Removes the dumb Holidays.
Adds more real life and fictional holidays, and adds a blurb for all of them.
2015-11-23 09:28:34 -05:00
Neerti
3ebd27eece Forgot to commit this. 2015-11-22 22:03:50 -05:00
PsiOmegaDelta
d709363ff7 Radio NanoUI.
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
2015-11-22 21:42:54 -05:00
PsiOmegaDelta
3eae0d5101 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-11-22 21:42:27 -05:00
PsiOmegaDelta
2200bfe436 Map tweaks.
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
2015-11-22 21:41:41 -05:00
PsiOmega
5047ea8267 Observers can now view radio settings, admins can alter them.
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
2015-11-22 21:40:59 -05:00
PsiOmega
5bf7158c9d Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
Conflicts:
	html/changelogs/PsiOmegaDelta-Radio.yml
2015-11-22 21:37:21 -05:00
PsiOmega
1bd40cf8aa Makes the cyborg radio menu more consistent. 2015-11-22 21:36:18 -05:00
PsiOmega
42342bedcb Rotates and otherwise cleans up map intercom usage.
Conflicts:
	code/controllers/communications.dm
2015-11-22 21:35:36 -05:00
PsiOmega
92afc566bb Makes it possible to select department channels on intercoms.
Conflicts:
	code/game/objects/items/devices/radio/intercom.dm
	code/game/objects/items/devices/radio/radio.dm
2015-11-22 21:34:13 -05:00
Jon
31702c626d Comments out the Geneticist job so that it doesn't appear in the preferences. Given that it doesn't work in any way, has 0 slots, and nobody's overhauling it any time soon (probably), I don't see the point in having it available in the preferences screen - that's just confusing. 2015-11-22 11:26:15 +00:00
Neerti
38833c18c4 Adds check if something in hand would have access before returning it. 2015-11-19 08:40:41 -05:00
Neerti
70ade2ed59 Fixes access checks ignoring the ID in your hand if already wearing an ID. 2015-11-19 08:00:07 -05:00
Neerti
9473b7567e Fixes antags spawning in space. 2015-11-19 04:49:35 -05:00
Neerti
dd3ab4dac0 Finishes new ling, need better sprites but that's for another time. 2015-11-18 16:20:28 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/outsider/ert.dm
2015-11-06 17:50:34 +01:00
PsiOmegaDelta
e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
2015-11-06 17:43:05 +01:00
PsiOmegaDelta
20eb505c69 Adds antag datum flag that is used to exlude the type from random selection.
Death Commando, Mercenary Commando (inherits from death commando), and the ERT antag types added to the exclude list. Fixes  #11416.
2015-11-05 08:48:05 +01:00
Woodrat
0929cb4cc2 Woodrat v9.6 "Open Beta"
- Minor tweaks to sleepers so they can can be set in different directions
- Sleepers and body scanners added to all maps
2015-11-03 14:30:56 -08:00
PsiOmegaDelta
19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta
694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00