fc9143051f
Clicking the magnetic card slot option on the desktop will eject all cards. No more eating cards!
2014-06-24 06:31:32 -04:00
9874ce38ce
shuttle_controller now uses a shuttle datum
...
Conflicts:
code/game/machinery/computer/communications.dm
code/modules/admin/verbs/randomverbs.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/power/singularity/singularity.dm
2014-06-23 11:07:58 -04:00
615f81588a
uses get_turf instead of get_turf_loc now
2014-06-23 06:23:11 -04:00
54bfc06609
Forgot to commit welcome.dm
2014-06-23 06:22:56 -04:00
2d963b8a43
laptop vendor!
2014-06-23 06:17:59 -04:00
e55208bc69
fixes for potential runtimes.
2014-06-23 06:17:48 -04:00
21a1f2eefe
laptop vending part 1. and more cleanup.
...
Conflicts:
icons/obj/computer3.dmi
2014-06-23 06:17:36 -04:00
fbfecb0e99
lowercase ntos by request of mloc + updates to background.
2014-06-23 06:17:11 -04:00
54b2e5f7a7
Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.
...
Conflicts:
code/datums/browser.dm
html/browser/common.css
2014-06-23 06:16:29 -04:00
f35d8d335d
Paradise fixes to PR
2014-06-23 06:12:41 -04:00
8a33620554
Initial commit of Computer 3 from Paradise, along with a bunch of fixes.
...
Conflicts:
code/__HELPERS/unsorted.dm
code/datums/browser.dm
code/setup.dm
icons/obj/computer3.dmi
2014-06-23 06:02:36 -04:00
b8c1dbf620
Preparing repo for overhauled computer3
2014-06-23 05:52:00 -04:00
b64441cb26
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
Conflicts:
code/game/gamemodes/blob/theblob.dm
code/game/machinery/doors/airlock.dm
code/game/objects/structures/window.dm
code/game/turfs/simulated/walls_mineral.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/reagents/reagent_dispenser.dm
2014-06-22 02:03:42 -04:00
900c130f7f
Ambassador karma unlocks
2014-06-20 07:22:02 -04:00
5113c03c76
ixes #5075
...
Mech fabricator redefined check access for no reason, let base proc handle it.
Adds span classes for messages guestpass console gives.
2014-06-18 00:01:00 -04:00
4a2993b20b
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
Conflicts:
code/__HELPERS/unsorted.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/silicon/robot/component.dm
code/modules/mob/living/simple_animal/bees.dm
code/modules/projectiles/gun.dm
code/modules/reagents/reagent_containers/syringes.dm
code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
4d5861ca30
Runtime fix with tape
2014-06-17 04:16:39 -04:00
bd346bca9a
Bleh
2014-06-17 04:04:57 -04:00
98041d2b3d
No colored windows for shuttle
2014-06-17 03:53:44 -04:00
ed36dbd6d9
2 new karma jobs -- Brig Physician and Magistrate
2014-06-15 23:40:47 -04:00
2097bed55d
3rd mining overhaul commit, fun KEPT.
2014-06-15 07:52:52 -04:00
8d9baa259c
Fix powerarmor slowdown situation
2014-06-10 03:32:50 -04:00
a3bb74cf07
Powerarmor derp fixes
2014-06-09 17:51:16 -04:00
c7cf7650af
Powerarmor fixins
2014-06-08 22:19:41 -04:00
751c3badd1
Added powerarmor to RnD
2014-06-05 22:09:32 -04:00
02730d515a
Fixes #5061
2014-05-28 08:52:24 -04:00
a57d2fb636
Starting to shape up powerarmor for eventual inclusion.
2014-05-26 12:22:27 -04:00
a6ee8dc678
Revert gun pool for now.
...
Conflicts:
code/game/machinery/turrets.dm
code/modules/projectiles/projectile/beams.dm
2014-05-19 19:34:20 -04:00
96ee35e5de
Added Mechanic karma job, builds and repairs spacepods, works under the CE
2014-05-19 06:49:35 -04:00
73f12189b7
First step in regrouping all non-spell abilities under the same tab to facilitate UI navigation.
2014-05-18 00:58:25 -04:00
e7d4c1db14
OH GOD YOU CAN BUILD PODS NOW OH GOD
...
Conflicts:
code/datums/helper_datums/construction_datum.dm
code/game/machinery/constructable_frame.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/mecha_construction_paths.dm
code/game/mecha/mecha_parts.dm
html/changelog.html
maps/tgstation.2.1.0.0.1.dmm
2014-05-17 19:05:08 -04:00
2754b56e0c
adding the spirit entity code, fixing the cameraNet so that it compiles properly
...
Conflicts:
code/datums/visibility_networks/dictionary.dm
code/game/machinery/doors/door.dm
code/modules/mob/living/silicon/ai/freelook/cameranet.dm
2014-05-15 05:06:38 -04:00
b23f90b10a
Feed and Facehug no longer use a menu and instead pick a random target in range.
2014-05-07 21:43:17 -04:00
18e3e37507
adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
Conflicts:
icons/obj/hydroponics.dmi
icons/obj/xenoarchaeology.dmi
2014-05-03 17:25:57 -04:00
345efee151
Atmos mainline pipe code moved and enabled.
2014-04-30 13:51:29 -04:00
ebfcc9be79
Object pool for beam projectile, minor changes to object pool.
...
Conflicts:
code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
code/game/objects/structures/grille.dm
code/modules/power/singularity/emitter.dm
code/modules/projectiles/projectile.dm
code/modules/projectiles/projectile/beams.dm
2014-04-29 13:33:06 -04:00
9227481a8a
Standardize windows.
...
Conflicts:
code/WorkInProgress/buildmode.dm
code/game/machinery/doors/airlock.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/twohanded.dm
code/game/objects/structures/window.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
f7246e3a40
Swap NT Rep and Customs Officer costs
...
30 for NT Rep, 15 for Customs Officer to represent their importance.
2014-04-15 00:37:27 +09:30
fb29f28a96
Emergency Message Cooldown
...
Dropped from 10 to 1 minute so people can actual hold a bit of
conversation with CC if needed. If they spam, BSA is still there.
2014-04-15 00:29:29 +09:30
cfbfa0e993
Smoke rework caused endless loops, reverted.
2014-04-08 01:47:56 +02:00
521ad31671
Revert the new lighting system.
2014-04-07 23:51:35 +02:00
0fba806c7b
Chemsmoke rewrite
...
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.
Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.
Conflicts:
code/game/objects/effects/effect_system.dm
icons/effects/96x96.dmi
2014-04-03 18:21:26 +02:00
7f4388c5a3
Cleaned the fuck out of smoke.
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
code/game/objects/effects/effect_system.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/organs/organ_external.dm
2014-04-03 18:18:04 +02:00
d65f57913e
Reduced six-state lighting to five-state, removed debug verbs.
...
Not a big drop in quality, but reduces the states used by half.
Conflicts:
baystation12.dme
2014-03-24 08:28:18 -04:00
d5e4fd0f33
Muh pod equipment
...
Conflicts:
code/modules/projectiles/projectile/beams.dm
2014-03-24 07:49:37 -04:00
8ff71e7626
Temporary pod changes
...
Conflicts:
maps/tgstation.2.1.0.0.1.dmm
2014-03-22 06:23:49 -04:00
d680d978f1
Nuh
2014-03-22 06:23:28 -04:00
00f542c267
Remove debug verb
2014-03-22 06:23:13 -04:00
68012f5017
Fixed a gamebreaking bug
...
Conflicts:
code/game/turfs/turf.dm
code/modules/mob/living/carbon/human/life.dm
maps/tgstation.2.1.0.0.1.dmm
2014-03-22 06:22:55 -04:00
24cd1706d7
Added the ability to use multiple light icons to represent over four states.
...
Conflicts:
baystation12.dme
2014-03-21 10:05:43 -04:00
DJSnapshot