Commit Graph

1145 Commits

Author SHA1 Message Date
Rob Nelson
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
Necaladun
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
Necaladun
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
alex-gh
cfbfa0e993 Smoke rework caused endless loops, reverted. 2014-04-08 01:47:56 +02:00
alex-gh
521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
Loganbacca
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
Chinsky
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
Aryn
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
d3athrow
d5e4fd0f33 Muh pod equipment
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-03-24 07:49:37 -04:00
d3athrow
8ff71e7626 Temporary pod changes
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2014-03-22 06:23:49 -04:00
d3athrow
d680d978f1 Nuh 2014-03-22 06:23:28 -04:00
d3athrow
00f542c267 Remove debug verb 2014-03-22 06:23:13 -04:00
d3athrow
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
Aryn
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
Aryn
cff01f9df6 Fixed an annoying bug with giving another player a flashlight,
opened up at least 100 individual bugs where people kept setting
loc and expecting light updates to catch it.

Conflicts:
	baystation12.dme
2014-03-21 09:51:15 -04:00
Aryn
5da65951e8 One runtime fixed, other one didn't turn up.
I put in some stuff for it to be easier to find if it does.

Conflicts:
	code/modules/power/singularity/singularity.dm
2014-03-21 09:49:42 -04:00
alex-gh
3d86ce975e Optimized atmos control computer.
Atmos control computer UI now only sorts actual air alarms, instead of all machines.
2014-03-14 00:36:41 +01:00
ZomgPonies
4f68015073 Compile fix 2014-03-07 22:53:37 -05:00
ZomgPonies
6035a0a5c0 MOAAAAR ponies 2014-03-07 22:51:49 -05:00
ZomgPonies
adde0bd14e Moar ponies 2014-03-07 22:28:29 -05:00
Chinsky
a53e9f285e I CERTAINLY DID NOT MAKE A TYPO WHAT ARE YOU TALKING ABOUT 2014-03-07 15:56:46 -05:00
Chinsky
88dea23510 Sanity plugs for two runtimes in lightning code 2014-03-07 15:56:33 -05:00
Aryn
2100368c86 Set lighting overlay's name to empty string. 2014-03-02 15:15:31 -05:00
Aryn
b773a05600 Fixed some bugs regarding space lighting. 2014-03-02 15:14:12 -05:00
Aryn
320d542c3f Temporary commit to back up data.
Conflicts:
	code/WorkInProgress/Aryn/Lighting/Controller.dm
2014-03-02 15:13:22 -05:00
Aryn
c0f08c309d Fixed ghosts' lighting toggle. Mesons still look weird. 2014-02-28 17:49:57 -05:00
Aryn
1712fc6a42 ChangeTurf()... We meet again... 2014-02-28 17:49:25 -05:00
Aryn
4b78bd469b Lighting code complete. 2014-02-28 17:49:11 -05:00
Aryn
52e2a3d1c6 Lighting seems to be working now. 2014-02-28 17:48:55 -05:00
Aryn
5b2f811b71 Lighting system is too buggy to continue until I know wtf is going on
Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
2014-02-28 17:47:50 -05:00
Aryn
d443734d60 Added lighting code, didn't include it yet. 2014-02-28 17:39:32 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Rob Nelson
7b7cfb605d Comm console is now NanoUI. Fixes github #489, hopefully.
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/nano/nanoui.dm
2014-02-15 15:33:45 -05:00
Rob Nelson
304be82a0a Fix sculpture not processing grab. 2014-02-04 03:14:42 -05:00
Rob Nelson
2a30bd9d3d More sculpture fixes.
Conflicts:
	baystation12.dme
2014-02-04 03:14:21 -05:00
wild-billy
f6b5ba0181 Screw with sculpture
Replaced grab refs
Shortened admin message
Commented null refs
Commented observer check during choke
2014-02-04 03:13:44 -05:00
ZomgPonies
bd946b0ab1 Fixes for new species 2014-01-28 16:33:02 -05:00
Rob Nelson
d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
Rob Nelson
dd8c8c12ab Standardize XRAY.
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
2014-01-21 22:37:37 -05:00
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies
37cf92c4f8 Powers fix right file 2014-01-19 21:14:06 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
Ccomp5950
7541463e01 Moved Supermatter.dm out of the WorkInProgress directory.
Conflicts:
	baystation12.dme
2014-01-17 09:01:09 -05:00
ZomgPonies
2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00
alex-gh
717f6b45be Supermatter no longer irradiates other Z levels 2014-01-13 07:28:43 +01:00
alex-gh
998285b64d Slightly tweaked Supermatter to make it a bit more dangerous and a bit less efficient 2014-01-13 07:10:44 +01:00
Rob Nelson
f9ce44e891 Fix atmos control computer. 2014-01-11 20:44:12 -05:00
YotaXP
b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
ZomgPonies
af92092f64 Fixed Slimaggedon spawning -- Uses antag menu 2014-01-04 22:11:16 -05:00
ZomgPonies
271100c2fd Stupid bush killing my goose 2014-01-02 02:07:20 -05:00