Zuhayr
f908119b98
Very minor oversight.
2015-05-12 23:56:51 +09:30
Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Zuhayr
9896bb4a9c
Cleanup of custom item icons.
2015-05-12 23:21:23 +09:30
Chinsky
c36ac12d9f
Merge pull request #9128 from mwerezak/canister_valve
...
Fixes pressure overshoot when filling nearly empty tanks
2015-05-12 16:29:32 +03:00
PsiOmegaDelta
57b5d43b4e
Merge pull request #9218 from Zuhayr/hailers
...
Allows hailer messages to be altered.
2015-05-12 15:00:36 +02:00
Zuhayr
da7bfd137b
Renaming custom item icon files.
2015-05-12 21:39:46 +09:30
Zuhayr
49930fe55d
Debugging!
2015-05-12 21:30:06 +09:30
PsiOmega
b52cf35680
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
Zuhayr
2222445eb3
Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites
...
Adds 7 new AI core sprites and adds new pAI card sprites.
2015-05-12 21:01:30 +09:30
Chinsky
e9cc39039c
Merge pull request #8946 from Zuhayr/miningstuff
...
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
PsiOmegaDelta
d12d1b93d1
Merge pull request #9204 from Ccomp5950/mangled_request
...
Holodeck items no longer spam admin attack logs.
2015-05-12 11:22:02 +02:00
Zuhayr
c8135cf87b
Merge pull request #9205 from mwerezak/masks
...
Snacks, drinks, and pills now check mouth coverage
2015-05-12 18:11:48 +09:30
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
27f03d557f
Allows hailer messages to be altered.
2015-05-12 16:42:43 +09:30
Zuhayr
c84089af3c
Merge pull request #9206 from comma/deaddoll
...
Preview icon refactor
2015-05-12 15:59:00 +09:30
Zuhayr
f76a1d2024
Removed custom item defines, refactored mech kits.
2015-05-12 15:49:56 +09:30
Zuhayr
59af7e5c4d
Refactor/rewrite of custom item spawning.
2015-05-12 15:14:51 +09:30
PsiOmegaDelta
b30465374d
Merge pull request #9201 from GinjaNinja32/vine
...
Fixes vines not being vines.
2015-05-12 07:04:41 +02:00
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
Zuhayr
6ee97e03a6
Removing a call to initialize().
2015-05-12 13:22:57 +09:30
Zuhayr
3184f157e9
qdel
2015-05-12 13:12:58 +09:30
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
mwerezak
b721eb36ef
Span classes and visible_message(), changelog
2015-05-11 23:40:44 -04:00
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Zuhayr
28134c9c8c
Readded wallbreaker check to wall destruction.
2015-05-12 13:06:54 +09:30
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
mwerezak
bab998d011
Improves overshoot when filling air tanks.
...
Estimating the transfer amount assuming that the sink temperature remains unchanged, and then using that estimate to obtain an estimate for the final sink temperature. This is then used to obtain a final transfer amount in predictor-corrector fashion.
2015-05-11 22:58:44 -04: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
mwerezak
b1bfbf346d
Snacks, drinks, and pills now check mouth coverage
...
Mouth coverage is defined somewhat conservatively so that breath masks
and the like do not prevent eating. In general only things that
completely cover your face or head like gasmasks and space suit helmets
block eating and drinking, or forcing the same on someone.
2015-05-11 22:17:24 -04:00
ccomp5950
569e785014
Holodeck items no longer spam admin attack logs.
...
/obj/items now has no_attack_log variable if set to 1, it won't log.
All holodeck items and lasertag weapons have no_attack_log set.
<3 Mangled
2015-05-11 22:11:46 -04:00
Zuhayr
abc75718b7
Merge pull request #9179 from PsiOmegaDelta/LevelSevenBioHazard
...
Adds announcement to the space vine event
2015-05-12 11:29:24 +09:30
Miniature
ed60b17f8d
Cherrypicking Mini's custom item code.
2015-05-12 11:02:34 +09:30
Zuhayr
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
GinjaNinja32
3fc9d89163
Fixes vines not being vines.
2015-05-12 01:56:51 +01: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
Zuhayr
0e0f29632a
Added construction states to walls.
2015-05-11 19:56:32 +09:30
Zuhayr
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
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
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
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
