Commit Graph

861 Commits

Author SHA1 Message Date
ArcBot
9a11c728a8 Fixes spectrometer not accepting coolant 2016-05-15 16:37:20 -04:00
skull132
8b5c7bc2c5 Conflict resolution
Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt
2016-03-25 22:25:41 +02:00
skull132
3d3dbcb8f0 JMP logs for days
Adds JMP messages to most forms of physical attacks.
2016-03-25 18:27:37 +02:00
skull132
8383f1c03b Generalizing establish_db_connection() and setup_database_connection()
Both procs are now generalized, and accept a DBConnection object as an argument. Due to this generalization, all instances of `establish_db_connection()` must be renamed to `establish_db_connection(dbcon)`.
Also added variable `failed_connections` to the definition of DBConnection.
2016-03-04 00:53:37 +02:00
skull132
fcd393ee94 Merge pull request #33 from skull132/SQL-backend-import
Sql backend import
2016-02-01 16:11:10 +02:00
skull132
179431115b Merge remote-tracking branch 'Aurorastation/development' into SQL-backend-import
# Conflicts:
#	code/modules/admin/admin.dm
#	code/modules/admin/admin_verbs.dm

All conflicts cleared. Wind funciton needs a quick redo as a result.
2016-02-01 16:00:54 +02:00
PsiOmegaDelta
56ace3b6ec Circuit Imprinter now checks all stack/material types.
Instead it only relies on its materials list to see which types are valid. Fixes #12081.
2016-01-31 11:01:49 +01:00
skull132
253ca5a295 Merge remote-tracking branch 'Lady_of_ravens/gloves'
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous.dm
#	code/modules/research/designs.dm

All conflicts cleared.
2016-01-28 01:44:28 +02:00
PsiOmegaDelta
21c8920271 Fixes food and radiocarbon spectrometer reagent injection.
Fixes #11913. Fixes #12048.
2016-01-27 11:22:46 +01:00
skull132
4c0867c922 Merge pull request #22 from Ryan784/Lawgiver-1.0
Lawgiver
2016-01-24 23:12:44 +02:00
skull132
df009a3307 Merge pull request #3 from skull132/telescience-import
Telescience import
2016-01-24 23:11:09 +02:00
Atlantis
ea5504c9ae Adds a floodlight cyborg upgrade
- Floodlight upgrade doubles cyborg's light intensity, but increases power usage from cyborg's power cell considerably.
- It may be obtained via exosuit fabricator as other upgrades do. Application requires a roboticist/research bot
2016-01-16 12:58:26 +01:00
Atlantis
dd74c30b58 Replaces Construction module
- Construction module merged back into Engineering module.
- RCD is not available by default. It is now an upgrade, as is the jetpack for mining module, etc.
- Matter synth capacities adjusted a bit. Steel increased from 40 sheets to 60 sheets. Originally (before matter synths were introduced at all) engiborgs had approx. 100 sheets worth of materials. Plasteel increased from 10 sheets to 20 sheets since rwalls require 4 sheets, instead of 2 for quite some time now.
- Adds possibility to install a matter bin into cyborg. Matter bin multiplies cyborg's material capacity. Obviously this is most useful for engineering borgs. Default multiplier is 1, regular matter bin has 2, advanced matter bin 3 and super matter bin 4.
2016-01-16 12:38:02 +01:00
FelisCorax
e2f63626f3 Stungloves, forcegloves, and watches, oh my! 2016-01-15 14:00:26 -05:00
Ryan784
92c1ab268c Lawgiver reinstated
Adds back in Lawgiver, the lawgiver lockbox and the ability to create
them in research.
2016-01-14 16:54:26 -05:00
skull132
c7ae4df416 dbcon_old removal, table prefixing
Prefixes the tables properly with ss13_, and removes active references to dbcon_old and related procs.
2016-01-13 15:59:36 +02:00
Atlantis
17aa6087a0 Fixes incorrectly set entry for steel in Circuit Imprinter 2016-01-11 06:44:28 +01:00
Atlantis
409a832646 Fixes #11931 + Design bug
- NTNRC conversations are now rather matched by Unique ID that's assigned on New(), rather than name. This has a nice side effect of being able to have conversations that share names.
- Tweaks design datums a bit. Renames "processor unit" to "computer processor unit", etc. since i noticed telecomms machine already uses "processor unit" name. Also corrects duplicated ID.
2016-01-08 01:55:56 +01:00
Atlantis
265c0d2567 Modular Computer Multitasking + Fixes
- Modular computers now support multitasking.
- New hardware type added. Basic CPUs may be obtained when purchasing a laptop or tablet, Photonic CPUs can be printed at research at imprinter. This hardware piece determines how many programs can be on background.
- Programs can now have an icon that is rendered in main UI's header (along with the power icons, etc.) when the program is on background. As an example, these icons have been added to NTNRC client (Dark icon when no messages have been received, blinking when new message is waiting), Alarm monitor (Blinking red when an alarm is active, green otherwise) and downloader program (Animated arrow when downloading, stationary when finished.)
- Adds missing crew monitor icon to tablets. Fixes #11937
2016-01-08 01:34:30 +01:00
RavingManiac
6e82dfa381 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2016-01-04 19:25:36 +08:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
Chinsky
e947862886 Merge pull request #11851 from atlantiscze/31-12-2015-consolepresets
Modular Consoles, Tweaks
2016-01-02 01:25:50 +03:00
Karolis2011
3076884f6e Adds new modular ID modification console and
removes old console. This commit won't compile.
2015-12-31 13:17:31 +02:00
Atlantis
b03abf3eef Fixes recipes for components that use steel
- Because metal != steel
2015-12-30 14:47:13 +01:00
Atlantis
605b78d377 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-12-29 20:25:34 +01:00
PsiOmegaDelta
a4545f8ded Scheduler, observation, and New() tweaks.
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
2015-12-27 17:44:53 +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
RavingManiac
b405c575cf Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-11-19 14:45:30 +08: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