Commit Graph

4129 Commits

Author SHA1 Message Date
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
Hubblenaut
a0e0f235ab Fixes camera repair 2015-12-02 15:35:27 +01:00
Zuhayr
4fc314bf85 Adds a /prebuilt floor light for use by mappers. 2015-12-02 19:55:15 +10:30
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
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
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
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
Jon
221a4edc19 Attempts to revert and/or fix some of the changes that went into Bay Dev to alter sleepers/scanners.
- Removes the NORTH/SOUTH sprites for the scanners, consoles, sleepers, etc. They're new, we don't use them, and I don't particularly like the look of them. We can add them back later if necessary.
- As per the new changes I've kept directional sprites as opposed to "thing-r" for right facing.
- The new body scanner sprite (white, whereas the previous is a grubby grey) has been reverted as it does not match the console.
- Sleeper console re-added, new sleeper NanoUI is still in but runs off the console not the sleeper.
- Proper directional stuff kept with the consoles, as far as I'm aware. By default the sleepers/scanners all have the consoles on the right. Light code changes will be needed to accommodate alternatives, the sprites still exist.
- Both consoles are animated and correctly disable animation with no power.
- Scanners are still entered with a verb, or clicking when grabbed, whereas sleepers are entered by click-dragging from the mob. This will probably want to be unified as I don't think this is how it used to be.
- Both consoles can be walked through, as was previously changed on Polaris.
- NO MAPPING CHANGES! The consoles work but will need to be mapped in to maps using the Polaris codebase.
2015-10-31 22:55:17 +00:00
PsiOmegaDelta
ab2ddfcba7 Atmospheric computer circuit additions.
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392.
Computers also no longer attemps to qdel a type on Destroy()
2015-10-29 16:55:58 +01:00
PsiOmegaDelta
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master
Dev-freeze.
2015-10-21 10:36:30 +02:00
PsiOmegaDelta
2a936d247d Airlocks should no longer be temporarily electrified for the rest of the round.
Airlocks are no longer electrified for as long as the round has been going when EMPd.
2015-10-20 08:33:47 +02:00
Daranz
6107db1ba4 Fix missing quote marks in HTML lines. 2015-10-16 12:35:27 -04:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
PsiOmegaDelta
2fcaaf80c7 Chemistry machinery fixes.
Makes Topic() calls check parent. Adds proper operable() checks where applicable.
Makes the interact_offline only affect the NOPOWER flag.
Fixes #11116. Fixes #11302.
2015-10-15 11:31:57 +02:00
PsiOmegaDelta
b891ef9754 Ensures the nuclear disc always spawns on the station.
Also make sure the pick_area_turf() call doesn't runtime due to the predicate list not being a list.
2015-10-15 11:01:47 +02:00
PsiOmegaDelta
3b5990121f Blobs locations are now more random.
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.

Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
2015-10-11 17:17:41 +02:00
Mark9013100
1eab12fc26 Two minor edits to ERT equipment 2015-10-11 00:30:10 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00
PsiOmegaDelta
fd3370c01f Fixes #11263.
Now possible to use items other than emags on holodeck computers
Blobs no longer make computers lose their density state.
Holodeck computers can now be repaired (and built, but since they cannot be configured they'll be useless).
Fixes #11263.
2015-10-10 10:11:48 +02:00
PsiOmegaDelta
8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo
Updates blob
2015-10-08 07:58:15 +02:00
Kelenius
83adba88d4 Updates blob
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
2015-10-05 18:10:16 +03:00
Vivalas
d2c355a937 Adds in KillerKickthroats 2015-09-30 17:56:35 -05:00
Daranz
b881d4055f Make cloners go 'DING!' when ejecting clones 2015-09-27 13:55:37 -04:00
mwerezak
03cb79a85d Merge pull request #11187 from PsiOmegaDelta/150925-Destruction
Destroy tweaks.
2015-09-26 20:22:01 -05:00
PsiOmegaDelta
11a03abbf7 Makes more external sources of radiation respect rad-protection.
More radiation sources now use the apply_effects() proc to increase rad levels, as this proc respects radiation protective gear (such as radiation suits).
Does not affect internal sources, such as food, injections, etc.
2015-09-25 15:02:20 +02:00
PsiOmegaDelta
9dd1a54191 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-09-25 10:44:23 +02:00
PsiOmegaDelta
d891fba1cc Mob size tweaks.
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
PsiOmegaDelta
7ce27f76fd Macro refactoring.
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +02:00
PsiOmega
98175214d6 Attempts to improve mob in view acquirement.
Creates a central proc that can (and will be) re-used.
This proc is hopefully more expandable by utilizing proc overrides.
It is now 1 instead of 3 loops (made even worse by the fact that each individual loop would re-acquire targets in view).
2015-09-13 14:32:49 +02:00
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
PsiOmegaDelta
0b433eb90c Code relocation. 2015-09-11 08:45:49 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
PsiOmegaDelta
2007004f3c Qdel cleanup.
Replaces a few instances of del() with qdel().
2015-09-09 12:20:33 +02:00
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be Updates "on merge" entries. Relocates code. 2015-09-08 08:03:14 +02:00
PsiOmegaDelta
2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
2015-09-08 07:58:25 +02:00
PsiOmega
8e9705b6c7 Re-adds recharge station checks.
Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them.
2015-09-07 08:16:31 +02:00
PsiOmega
3a2b1be8e1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-07 08:09:01 +02:00
PsiOmega
8dea4d40c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-07 08:01:15 +02:00
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Zuhayr
dd81250b1b Merge pull request #10784 from Kelenius/masterRuntimes
Fixes two runtimes
2015-09-07 14:01:24 +09:30