Commit Graph

461 Commits

Author SHA1 Message Date
Arokha Sieyes
88b5756977 Arokha SA Rework (Polaris) 2017-03-22 19:32:19 -04:00
Anewbe
38598f3aae Merge pull request #3118 from Neerti/3/6/2017_surface_map
Continues work on the surface map
2017-03-22 16:33:40 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
Neerti
b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Screemonster
922fe1db81 makes fire even greater than it was before 2017-02-15 03:56:09 +00:00
Nerezza
df5906dc6b Misc windoor/airlock fixes
This started as me making robots able to rename windoors and turned into something a little more.
2016-11-19 21:43:46 -06:00
Spades
0b6285b153 Fixes external airlocks 2016-08-29 20:02:03 -04:00
Hubblenaut
044a677ab0 Construction Tweaks and Fixes (#2253)
* Fixes reinforced Walls construction

when having one sheet left in the stack

* Amends Windoors

 - Assemblies are now made with two sheets of either normal or reinforced
   glass sheets, for normal and secure windoors respecting.
 - Assemblies can now be named with a pen, just like airlocks.
 - Windoor assemblies now get placed like windows, and windows take
   windoor assemblies into account when placed.
 - Decapitalises windoor assembly names.
 - Shattering windoors will make them drop exactly what they were made of
   now.
 - Prying emagged windoors will no longer make them shatter on top of
   returning to an assembly.
 - Cleans up a lot of code and gets its own update_icon() proc.

* Amends airlocks

 - Fixes airlocks occasionally not updating their icon correctly.
 - Fixes airlocks causing sparks on spawn as if they were damaged.
 - Fixes airlock not being anchored after being turned into an assembly.
 - Decapitalises airlock names.

* Windows that get unanchored by force will now correctly have the rotate verb.

* Adds changelog entry
2016-08-02 18:39:22 +01:00
Anewbe
4e25ac5187 Fixes bashing doors 2016-07-15 09:33:22 -05:00
Neerti
06b97aa990 Makes clicking on airlocks work again. 2016-07-09 22:37:51 -04:00
Anewbe
f27fa6cc2b Adds a pry var to objects, which checks if the obj can open doors 2016-07-09 00:24:12 -05:00
Arokha Sieyes
f51b725c23 Fixes #1837
They obviously have little windows on them. And this is how they used to be. Was probably an oversight when they were converted to another format or something. Airlocks without windows are preeeetty silly.
2016-06-12 15:35:33 -04:00
Yoshax
49a249af00 Multi-tile airlock building FIX 2016-05-16 18:31:32 +01:00
Neerti
0aa252825a Armblade Additions plus One Other Thing
Armblades can now force depowered or broken airlocks, firelocks, and blast doors, just like a crowbar.
Armblades can slash APCs to cut all the wires.  Fixing the damage is as simple as mending all the wires.
Cleans up the fireaxe wielding check in airlock.dm
Removes colon cancer in blast_door.dm
Not armblade related: Self Respiration is now a free passive ability instead of costing one genome.
2016-03-31 16:39:10 -04:00
Zuhayr
f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options.
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
Hubblenaut
94d1ad8dc1 Doors buzz only once on failed closing 2015-12-08 16:13:31 +01: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
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
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
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
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
7ce27f76fd Macro refactoring.
Turns several of the is* procs into istype defines.
2015-09-16 12:57:14 +02:00
Zuhayr
fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
Zuhayr
9d5f14298d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/gamemodes/traitor/traitor.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
PsiOmega
5ae74883d2 Hull shields should no longer prevent the departure shuttle from leaving.
If hull shields are left alone by the crew (due to being, for example, all dead) the departure shuttle is unable to leave.
This should destroy any shields faster than they can regenerate, thus ensuring a safe and pleasant departure.
2015-09-05 16:49:15 +02:00
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
Woodrat
c192378bab Woodrat Work v8.2
- Placed missing metal and glass from R&D back into R&D.
- Fixed a broken scrubber pipe on the research outpost catwalk.
- Mining and Research Outpost power issues should not be as major right off the bat. In theory should at least last half the round? Further testing needed.
- Discovery about research and mining elevators made. Filled in more asteroid turf around both, added lights to both.
- Wrong tile used in port security maintenance fixed.
- Second camera added to the AI core cause Koco is a dum dum.
- New door sprites and new door. Mixture between atmos and engieering doors, dual access. Placed on the monitoring room behind the front desk.
- Fixed Filter to phoron on the mining engineering outpost.
- Mining engineering outpost fully camera'd
- Lattice added to underneath heat exchange pipes and around the engine heat exchange pipes.
- Complete and total overhaul of the mining outpost.
- Re-removed the RCD from the industrial hardsuit.
- Blue flags created.
- One blue flag and one red flag added to the laser tag lockers.
2015-08-22 12:33:27 -07:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
Zuhayr
1b7f8d7be2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-18 11:32:46 -07:00
PsiOmega
439b976272 Admin level doors are now always of the secure variant.
Players keep finding ways to surprise.
2015-08-17 22:41:19 +02:00
PsiOmega
c51e208094 One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686. 2015-08-15 15:22:37 +02:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
mwerezak
0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
GinjaNinja32
63ea8338fb Merge remote-tracking branch 'upstream/dev' into span_class=notice
Conflicts:
	code/ZAS/Diagnostic.dm
	code/game/machinery/computer3/laptop.dm
	code/game/machinery/requests_console.dm
	code/game/objects/items/stacks/tiles/plasteel.dm
2015-06-05 00:49:13 +01:00
PsiOmegaDelta
3988d6ac90 Merge pull request #9388 from Techhead0/prisonBreak2.0
Refactors and expands the Prison Break event.
2015-06-02 18:58:20 +02:00
GinjaNinja32
314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm
2015-06-02 17:33:20 +01:00
Techhead0
2b8d6db61e Refactors Prison Break event.
Affects the Brig, Virology, Xenobiology or all three.
Adds warning messages to Engineering request consoles and AI.
Prevents doors from bolting open if unpowered
Reduces light overload frequency.
2015-05-31 23:25:52 -04:00
GinjaNinja32
d5e0a60a6b Merge pull request #9566 from PsiOmegaDelta/150529-Doors
Fixes #9559.
2015-05-31 20:11:33 +01:00
PsiOmega
2f1202d5e0 Airlock fixes.
Changes door closing to use the same sound playing setup as door opening. Fixes #9559.
2015-05-30 20:41:25 +02:00
Zuhayr
f9e99e1ee9 Fixes #9581 2015-05-31 03:34:29 +09:30
GinjaNinja32
dfd871f168 code/machinery, fix for code/antagonist merge string causing false positive 2015-05-30 14:05:32 +01:00
mwerezak
e6be73ac56 Airlock sounds 2015-05-23 22:59:18 -04:00
Zuhayr
f4923e2a20 Renamed twohanded weapons, collapsed bats. 2015-05-16 21:12:54 +09:30