Commit Graph

682 Commits

Author SHA1 Message Date
Atlantis
605b78d377 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-12-29 20:25:34 +01:00
Atlantis
326922cd8d NTNet Relay upgrades
- NTNet Quantum Relays now have simple UI that allows users to manually toggle them on/off.
- Implements simplified Denial of Service handling for relays. This will be used by next commit that will add antagonist software.
- Relays can buffer and dissipate certain amount of DoS traffic. If this traffic exceeds certain level (configurable via varedit) the relay crashes temporarily.
- Relays may be manually reset by using specific button in the UI
- Relays are now buildable. They are relatively cheap (circuit board and some cables), but the board requires Data Theory 4 research.
2015-12-15 16:13:17 +01:00
PsiOmegaDelta
bbe65baf5c Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape
Conflicts:
	code/__defines/misc.dm
2015-12-13 11:50:06 +01:00
PsiOmegaDelta
eda4a5d595 Adds tape to medical, and excavation lockers.
Also maps in some EMT medical tape, corrects some badly rotated intercoms, and pixel shifts the large sinks properly.
2015-12-13 11:48:29 +01:00
Kearel
9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
Kearel
7b2b658644 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-07 11:43:51 -06:00
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev.
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
Kearel
caa0fbaea5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-05 12:47:03 -06:00
Atlantis
c7e7c05a34 Fixes #11546 2015-12-02 11:14:41 +01:00
Atlantis
7e39ef1a38 Hardware rework
- Hardware pieces are now items, rather than datums.
- Adds deconstruction for computers. Empty tablet/laptop/console frames may be wrenched to break them back into metal sheets. You have to empty the frame first, by using screwdriver to take out components one by one.
- Components may be moved between devices. You can for example take your tablet, remove it's hard drive, and slot it into a console. It will have all the files it had on your tablet.
- Not all hardware can be fitted into all devices. Tablet can't hold 2K GQ cluster hard drive, for example.
- Hardware may be fabricated by research for relatively low costs, once you have relevant research levels. Obtaining computer this way is much cheaper than buying it at the vendor.
- Data crystals added (glorified USB flash sticks) that allow file transfer to different devices. File browser program updated accordingly to support importing/exporting of files to these crystals.
- Battery module added.  These are wrappers for actual power cell object and act as limit for cell size, otherwise it would be possible to have 30k cells inside devices, which would allow them to run insanely long.
2015-12-02 10:32:49 +01:00
Zuhayr
81a3cfdcb1 Merge pull request #10172 from LightningIron/mecha
Refactor of some mecha functions
2015-12-02 09:55:19 +10:30
Kearel
5cc2944733 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-11-28 11:21:07 -06:00
Kearel
4f241fd22c Reworked Orion Trail
Plays a bit differently. Slightly more challenging but still beatable
with proper strategies in use.
2015-11-22 20:23:31 -06:00
PsiOmegaDelta
f74d9e6862 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
	maps/exodus-1.dmm
2015-11-22 11:48:00 +01:00
PsiOmegaDelta
26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
GinjaNinja32
8e1928062b sulphuric acid is "sacid" not "acid" 2015-11-20 21:41:31 +00:00
Kearel
a8406f018b Adds Entertainment Items
Adds the following:
Actor Guild for ghosts to spawn at.
Board for playing board games.
Two trading card games with booster packs.
Tarot cards.
Cargo can now supply lasertag equipment as well as decks/booster packs
2015-11-12 23:24:34 -06:00
PsiOmegaDelta
1c053c7a9f Merge pull request #11444 from Baystation12/dev-freeze
Dev
2015-11-12 17:48:12 +01:00
Kelenius
531809efa2 Fixes #11347
Jesus Christ how horrifying
2015-11-10 14:15:37 +03:00
PsiOmegaDelta
42b98c45e4 Merge pull request #11220 from caelaislinn/new_xenoarch_sprites
Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org
2015-11-03 11:14:03 +01:00
Cael Aislinn
105792686a resprites xenoarch items (guns, eguns and other small stuff) and some large artifacts by skowron, reworks preset triggers to be a little more predictable for specific large artifact groups
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-10-17 02:02:55 +10:00
HarpyEagle
38775120d7 Updates mechfab
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
2015-10-08 16:03:32 -04:00
mwerezak
83df0fa8f8 Makes powercells produced by the protolathe start uncharged. 2015-10-08 15:10:51 -04: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
PsiOmegaDelta
96a90bb5e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-10-04 17:41:02 +02:00
PsiOmegaDelta
f4be4c0ad9 Merge pull request #11238 from Baystation12/master
Dev-freeze
2015-10-04 17:31:44 +02:00
GinjaNinja32
11141462a0 fix #11222
also fixes the name and adds feedback to adding items
2015-09-30 00:00:36 +01: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
LightningIron
46a90b383d Adjusts armor booster paths in mechfab_designs.dm. 2015-09-13 21:20:37 -05:00
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
Kelenius
1ac8b94427 Fixes a few issues with the mechfab, fixes #10852 2015-08-25 12:28:20 +03:00
Kelenius
dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic
Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm
2015-08-24 18:16:36 +03:00
PsiOmega
e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Kelenius
6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic
Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm
2015-08-21 16:59:57 +03:00
PsiOmegaDelta
a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02:00
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
PsiOmegaDelta
5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
Kelenius
3b1c5666d5 Merge branch 'dev' into ofMechfabAndPanic 2015-08-17 09:58:23 +03:00
Zuhayr
23e9c7d4c9 Merge 2015-08-16 17:10:11 -07:00
SomeoneElse
9b547608f6 [minor] Fix research design item path definition, usage of TECH_* macros
code/modules/research/designs.dm:
	fixed path definition of `datum/design/circuit/shield`
	fixed req_tech variable to now use TECH_* macros
2015-08-17 00:25:37 +06:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
GinjaNinja32
7dc85cfdd4 Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates
Computers are now overlay based.
2015-08-16 00:40:47 +01:00
mwerezak
77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00
mwerezak
a5fd2d386c Fixes #10637 2015-08-14 23:34:24 -04:00
PsiOmegaDelta
77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
Kelenius
012fb38de2 Finalizes mechfab 2015-08-12 21:46:11 +03:00