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
729e187ae6
Merge pull request #2546 from caelaislinn/bleeding-edge-freeze
...
Tweaks and such
2013-03-18 00:15:47 -07:00
7fbc86da5a
Vendors now charge money.
...
Swipe your ID card and enter PIN to pay.
2013-03-17 15:56:43 +01:00
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
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
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
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
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
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
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
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
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
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
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
53cfbaa480
tweaked some rust icons
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-05 16:22:35 +10:00
2a9f199441
Merge pull request #2469 from Uristqwerty/Tubes
...
Added: Code and icons for tube-based transportation.
2013-03-02 09:37:01 -08:00
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
48fefead00
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-03-01 23:15:38 -08:00
ad47e954ce
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-03-01 23:15:19 -08:00
533794b0db
some useability tweaks to atms
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-01 00:45:33 +10:00
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
67a4a94896
atm fix mk 2
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-01 00:15:17 +10:00
43ebfd1fdd
tweakfixes to finances
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-27 11:55:28 +10:00
26b4deb33f
Department accounts are created now and credentials given to heads.
2013-02-27 01:55:18 +01:00
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
02ace92b04
miscellaneous tweaks to finance machines
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-26 02:59:04 +10:00
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
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
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
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
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
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
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
a7a0e48d67
compile fixes, tweaks
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-24 22:06:36 +10:00
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
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
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
1469ccb7f9
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-23 19:39:05 +10:00
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
8639d00a9d
Removed double definition.
2013-02-22 23:13:22 +01:00
cc3d49cf4b
Merge pull request #2401 from caelaislinn/bleeding-edge-freeze
...
RUST updates, event tweaks, shielding updates
2013-02-22 07:05:11 -08:00
8ee5672159
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-02-22 23:56:38 +10:00
2c585fbcc4
moved shield files to folder, made circuitry for shielding gens/caps researchable, various tweaks and balances to the research requirements, made shield gens/capacitors orderable via cargo
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-22 23:49:29 +10:00
961c77e26e
Medical side-effects now appear on overdose.
...
Also reduced anti-toxins pill amount, because 50 units is way too much for a single pill.
2013-02-22 14:28:55 +01:00
4052e98723
made circuitboards for fuel injectors and rust core, made said circuits researchable, miscellaneous tweaks and cleanups
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-22 22:41:59 +10:00
947d69be69
Removes random side-effects being caused by most medicine.
...
Cryo and cloning will still cause it.
2013-02-22 13:33:49 +01:00
66b04ccf1d
made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-22 20:00:05 +10:00
7f9c95526d
consolidated icons
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-22 19:51:28 +10:00
d477b7230f
reworked rust components to integrate more smoothly with each other, cleaned up a bunch of useability issues, made all relevant components portable, fixed some random bugs, added a mostly nonfunctional map to show an example layout (based on antiqua's engineering layout)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-02-22 16:39:42 +10:00
6015df7178
Tweaks to side effects.
...
Removed itch one. Caused lots of whining, since it's quite counterintuitive to take drugs to treat itch instead of scratching it or removing bandage.
Made side effects contracting probability-based, probability higher the stronger chemical is.
2013-02-20 20:00:01 +04:00
Uristqwerty