Commit Graph

18426 Commits

Author SHA1 Message Date
Zuhayr
b15ff78302 Merge pull request #9130 from mwerezak/device-powercell
Adjusts charge cost for energy type guns
2015-05-12 18:11:39 +09:30
Zuhayr
084b2f7825 Merge pull request #9220 from comma/pruttyshiny
Useless lights galore
2015-05-12 17:30:38 +09:30
Chinsky
3b3f23e502 Useless lights galore, adding small/colorful lights:
Lamps (old-looking ones), flares now have different color from usual flashlight.
Lit cigs give 0.25 power light - just enough to stand out in full darkness.
Candles are colored too.
Different colors for different camera consoles instead of SUPER RED for everyone.
2015-05-12 10:23:24 +03:00
Zuhayr
c84089af3c Merge pull request #9206 from comma/deaddoll
Preview icon refactor
2015-05-12 15:59:00 +09:30
Zuhayr
c06323ef7a Merge pull request #9199 from Techhead0/voidmachine-englishlists
Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc
2015-05-12 14:20:37 +09:30
Chinsky
a6ecdedf74 Fix for being forever tajaran 2015-05-12 07:48:54 +03:00
Chinsky
495783de59 As per Ginja's suggestion, dummies are now used one per prefs datum.
Slightly less metal but amount of stuff created/deleted in every human is just too huge.
2015-05-12 07:24:25 +03:00
Techhead0
0d9a482be8 Removes frame_desc from circuitboards. 2015-05-12 00:09:51 -04:00
Chinsky
86c8c8c52b Changed similar proc in datacore to just use icons of actual human it gets. Works fine for both latejoin and roundstart.
Also fixed a runtime, somehow head was created without a tajaran and got lost.
2015-05-12 06:42:08 +03:00
Chinsky
5c8ceae2fa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into deaddoll
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
2015-05-12 06:04:22 +03:00
Chinsky
29823e3552 Changed update_preview_icon to use a human dolly to get all those icons instead of... old way.
I guess it's more hacky, but fairly shorter and means you don't need to touch that... thing when you add a new job/change existing loadout.
Also changed preference transfer to use appearance procs to properly sync with organ colors.
2015-05-12 05:55:49 +03:00
Techhead0
f6977dd8ed Changes machine frames and voidsuits to use proc/english_list()
Also includes formatting changes to voidsuit examine.
2015-05-11 20:29:35 -04:00
PsiOmega
d14904e1d6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm
2015-05-11 09:28:59 +02:00
PsiOmega
d1eae14343 Fixes #9183
Very critical. No lewdness allowed.
2015-05-11 09:08:27 +02:00
Chinsky
287a3805fd Merge pull request #9184 from mwerezak/vines2
Tweaks space vines
2015-05-11 09:16:03 +03:00
Zuhayr
6f41625752 Added construction drone sprites from Pawn. 2015-05-11 14:46:47 +09:30
mwerezak
d39fc76113 Tweaks space vines
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
2015-05-10 23:23:25 -04:00
Zuhayr
55b3b9d151 Merge pull request #9174 from PsiOmegaDelta/ImplantLogs
Corrects implanter attack log.
2015-05-11 11:44:25 +09:30
Zuhayr
2adc8df1fa Merge pull request #8903 from Mloc/lightwrite
Lighting rewrite
2015-05-11 09:26:04 +09:30
Chinsky
ea28e4aadf Merge pull request #9126 from Techhead0/magbootsOverShoesTwo
Magboots can be worn over shoes
2015-05-11 02:48:45 +03:00
Mloc
79a191a2b5 dynamic fire colours
Fire colour + light colour changes with temperature.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:29 +01:00
Mloc
7780287d3a mood lighting for computers
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:29 +01:00
Mloc
16d50c645d new object-based lighting system
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 20:54:25 +01:00
Mloc
733c6a4fb5 simulated var for atoms, used to filter explosions and other actions
kind of a stronger anchored var, used by lighting overlays

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:30 +01:00
Mloc
895e78df1e more lightweight camera caching
no loops

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:30 +01:00
Mloc
5b92057890 lights in areas that don't require power will now automatically turn on
Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:29 +01:00
Mloc
e602a7e286 remove the sub-area system
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
2015-05-10 17:06:29 +01:00
Chinsky
6669e9631e Merge pull request #9176 from StarSmasher44/patch-1
Optimises uniqueList()
2015-05-10 18:13:17 +03:00
Chinsky
6b57189076 Merge pull request #9171 from PsiOmegaDelta/DroneSplosion
Fixes #9169.
2015-05-10 18:06:22 +03:00
StarSmasher
09b92c347f Optimises uniqueList()
Credits go to /TG/, I just figured I'd do what the other codebases do and take it over for us as well.

Changes:

Optimises uniquelist()
also renames it from uniquelist() to uniqueList()
Test 1:

1,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 0.362
Clean out duplicates with my new uniqueList(), once:
self: 0.184

Test 2:

3,000,000 random numbers between 1 and 7 in a list.
Clean out duplicates with current uniquelist(), once:
self: 1.069
Clean out duplicates with my new uniqueList(), once:
self: 0.496
2015-05-10 16:59:32 +02:00
Zuhayr
6e003e6d99 Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime
Grabs no longer endless loop runtime.
2015-05-10 23:20:56 +09:30
PsiOmega
9d883ea914 Corrects implanter attack log.
The contents of the implant was reported in the attacker/victim log but not the admin log.
2015-05-10 15:11:37 +02:00
PsiOmega
fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
Ccomp5950
929e64311e Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions
Enforces antagHUD restrictions.
2015-05-10 06:03:36 -04:00
PsiOmega
647298e550 Fixes #9169.
Drones can now survive entering chargers and being picked up.
2015-05-10 10:52:56 +02:00
PsiOmega
5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
2015-05-10 10:43:46 +02:00
PsiOmegaDelta
928b0a8be5 Merge pull request #9162 from volas/admin_stuff3
Admin dice
2015-05-10 10:11:29 +02:00
PsiOmegaDelta
cd264fb558 Merge pull request #9160 from GinjaNinja32/acting_manifest
Acting jobs now sort with non-acting jobs on the manifest.
2015-05-10 10:10:13 +02:00
volas
a0f119b9dc Admin dice 2015-05-10 10:11:07 +03:00
Zuhayr
c0bb92bf34 Merge pull request #9146 from PsiOmegaDelta/AlarmConsoles
Station alarm monitor changes.
2015-05-10 15:37:50 +09:30
Zuhayr
a64f91994b Merge pull request #9151 from Yoshax/nomorechems
Removes sleepy chems from cloning
2015-05-10 15:37:21 +09:30
Zuhayr
90fd4d584e Merge pull request #9164 from comma/sterile
Made sterile gloves actually start sterile
2015-05-10 15:11:29 +09:30
Chinsky
6618b225a0 Made sterile gloves actually start sterile
Fixes #9163
2015-05-09 22:10:39 +03:00
Yoshax
8f9fd29c5f Removes sleeping chems from clones and adds a consistent sleep period (+1 squashed commits)
Squashed commits:

[2c002f9] Removes sleepy chems from cloning
2015-05-09 20:08:19 +01:00
Techhead0
95aef467a0 Magboots can be worn over shoes
Equipping magboots or a voidsuit with magboots installed will place them
over any existing shoes. Existing shoes are replaced on feet when magboots
are unequipped. Magboots cannot be worn over other magboots.
Fixes #9125
Changelog for this and my previous voidsuit changes included.
2015-05-09 14:20:03 -04:00
volas
9fadad7b33 Player age now displayed also in notes 2015-05-09 19:33:11 +03:00
volas
84696567d8 Ability to select job equipment in 'Select Equipment' 2015-05-09 19:29:26 +03:00
GinjaNinja32
75b5cf0b1e Acting jobs now sort with non-acting jobs on the manifest. 2015-05-09 15:36:04 +01:00
PsiOmega
be91976e30 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-09 11:13:05 +02:00
PsiOmegaDelta
2a53f6bf6d Merge pull request #9153 from Techhead0/rlimb_data-fix
Fixes rlimb assignment for hands/feet in chargen
2015-05-09 10:00:10 +02:00