Commit Graph

1075 Commits

Author SHA1 Message Date
cib
b6231ec33b Added more community news. 2013-05-19 06:03:39 +02:00
cib
8cfc395232 Added community-made newsfeeds.
Yay!
2013-05-18 23:20:20 +02:00
cib
be197afc77 Added system for newscaster events.
This way people can write stories, separated into several pieces, which will be announced through the newscasters over the course of the round.
2013-05-18 13:06:16 +02:00
SkyMarshal
5884f24f6a Adjusting air alarm settings.
"Scrubbing" is the default mode
"Panic" empties the room
"Fill" turns off the scrubbers and activates the vents in an effort to replace lost air
"Cycle" will trigger first a panic siphon then a fill mode in order to empty a room of contaminants before refilling it from the supply pipes
"Replacement" will turn on the panic siphon while continuing to add air into the room
"Off" will disable all attached devices. (This is useful for breached areas)
2013-05-16 17:29:58 -07:00
SkyMarshal
88a65b63e4 Fixes air alarms going off if the upper bounds were set to disabled.
Fixes atmos control computer displaying some air alarms in unreadable yellow
Fixes a text error in item descriptions.
2013-05-15 14:31:31 -07:00
SkyMarshal
697ab3dd7f Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card 2013-05-11 03:39:31 -07:00
Mloc-Argent
27759f47df Merged master into BEF.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-05-06 15:43:50 +01:00
Cael_Aislinn
29a3e93197 added safety checks for bad values in eftpos + atms
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-03 13:20:47 +10:00
Cael_Aislinn
ba763477eb fixed shield generators not charging fields
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-04-26 21:46:36 +10:00
SkyMarshal
6a38e51c73 Atmos control auto-update fixes
Air alarms now auto-refresh and have a mechanism to heat or cool rooms.
Space heaters can both heat and cool rooms
2013-04-19 01:52:24 -07:00
Uristqwerty
6a66f542d9 Update from early tubes with bugs, to tubes with less bugs and more features based on feedback. 2013-03-20 18:49:14 -04:00
Chinsky
729e187ae6 Merge pull request #2546 from caelaislinn/bleeding-edge-freeze
Tweaks and such
2013-03-18 00:15:47 -07:00
cib
7fbc86da5a Vendors now charge money.
Swipe your ID card and enter PIN to pay.
2013-03-17 15:56:43 +01:00
Cael_Aislinn
42d8cd33e0 made fuel injectors and core gens properly start in mobile configs, made large crates able to hold 1 large item (machinery or structure)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-16 20:58:31 +10:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:01:33 +10:00
Cael_Aislinn
44470e35b5 moved energy field layer to be above mobs
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:21:00 +10:00
Chinsky
55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi
2013-03-06 17:04:45 +04:00
Cael_Aislinn
53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 19:03:18 +10:00
Cael_Aislinn
00b0c09016 core gens start locked, added placeholder core monitor file
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 01:29:48 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:23:16 +10:00
Cael_Aislinn
9ca69998d0 cleaned up/added some missing icon_states for (rust) engineering areas
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 16:51:09 +10:00
Cael_Aislinn
09399cb74b some tweaks and balances to rust circuit research levels
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 16:47:26 +10:00
Cael_Aislinn
c6398d6d52 fixed some core field runtimes, made it actually process
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 16:41:10 +10:00
Cael_Aislinn
e511bf954e fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 16:23:59 +10:00
Cael_Aislinn
53cfbaa480 tweaked some rust icons
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 16:22:35 +10:00
Christian Bielert
2a9f199441 Merge pull request #2469 from Uristqwerty/Tubes
Added: Code and icons for tube-based transportation.
2013-03-02 09:37:01 -08:00
Uristqwerty
b455c42d96 Added: Code and icons for tube-based transportation.
Just an additional tool that mappers may find interesting or fun. At the moment, they do not use power or any resources, and there is plenty of room to extend and improve them, but they do work.

The basic tubes will read their directions from icon_state if they aren't specifically specified, so you can just use the built-in option to generate instances from icon states to get all possible tubes.
The tube stations use directions, instead.
2013-03-02 04:17:58 -05:00
Zuhayr
48fefead00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:38 -08:00
Zuhayr
ad47e954ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:19 -08:00
Cael_Aislinn
533794b0db some useability tweaks to atms
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-01 00:45:33 +10:00
Cael_Aislinn
4633373d1f fixed an issue with database reconnection
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-01 00:23:22 +10:00
Cael_Aislinn
67a4a94896 atm fix mk 2
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-01 00:15:17 +10:00
Cael_Aislinn
43ebfd1fdd tweakfixes to finances
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-27 11:55:28 +10:00
cib
26b4deb33f Department accounts are created now and credentials given to heads. 2013-02-27 01:55:18 +01:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-26 03:02:24 +10:00
Cael_Aislinn
02ace92b04 miscellaneous tweaks to finance machines
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-26 02:59:04 +10:00
Cael_Aislinn
c1eda324b8 inserting cards into atms only wipes the screen if the card is for a different account, cleaned up dme
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:43:52 +10:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:27:44 +10:00
Cael_Aislinn
3fcab3bf19 more changelog, boosted max shield charge rate
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:21:32 +10:00
Cael_Aislinn
5e99633c51 ordinary shield gens are now buildable
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 13:50:46 +10:00
Cael_Aislinn
a101b51fa0 normal shield gens produce a ring of shields around the machine, renamed file, useability and simplification tweaks to shield gen + cap, fixed some random issues with shields
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 13:50:34 +10:00
Cael_Aislinn
a77a409a78 tweaks to finances (added feedback to atms, made accounts synced to station account db at round start)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 13:44:35 +10:00
Cael_Aislinn
a7a0e48d67 compile fixes, tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-24 22:06:36 +10:00
Cael_Aislinn
6ec8669df6 Merge branch 'bleeding-edge-freeze' of github.com:caelaislinn/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
	icons/obj/device.dmi
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-24 11:18:49 +10:00
Cael_Aislinn
5860b749ae tweaks to eftpos, re-applied mapchanges (eftpos scanners placed in civilian departments, atms placed in main hallways, account databases placed)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-24 11:16:43 +10:00
Cael_Aislinn
ec023cc3f8 tweaks to finances (inc boost to wallet capacity, new sprite for eftpos)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 21:51:29 +10:00
Cael_Aislinn
1469ccb7f9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 19:39:05 +10:00
Cael_Aislinn
68abeda762 when players arrive, they are assigned a new account with random starting funds and the info for it is stored in their memory + ID card. id computer can now modify the account number associated with id cards
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 19:38:50 +10:00
cib
8639d00a9d Removed double definition. 2013-02-22 23:13:22 +01:00