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
a6ecdedf74
Fix for being forever tajaran
2015-05-12 07:48:54 +03:00
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
0d9a482be8
Removes frame_desc from circuitboards.
2015-05-12 00:09:51 -04:00
3184f157e9
qdel
2015-05-12 13:12:58 +09:30
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
b721eb36ef
Span classes and visible_message(), changelog
2015-05-11 23:40:44 -04:00
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
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
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
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
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
abc75718b7
Merge pull request #9179 from PsiOmegaDelta/LevelSevenBioHazard
...
Adds announcement to the space vine event
2015-05-12 11:29:24 +09:30
ed60b17f8d
Cherrypicking Mini's custom item code.
2015-05-12 11:02:34 +09:30
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
56c610e111
Updates weed control crate
...
Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles.
2015-05-11 21:20:16 -04:00
3fc9d89163
Fixes vines not being vines.
2015-05-12 01:56:51 +01:00
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
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
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
152156018a
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-11 07:46:51 +02:00
6f41625752
Added construction drone sprites from Pawn.
2015-05-11 14:46:47 +09:30
6b8f6178da
Fixes
...
- Fixes few typos in the code
- Fixes AI Eye object being solid, therefore being able to block movement of other players.
- Fixes non-station APCs boosting CPU as others.
Implemented Suggestions
+ Selection is now done in slightly better way (Basic Encryption Hack, Hack/Unlock Cyborg, Hack AI). Only relevant entities are offered in the list.
+ Adds varedit-modifiable variables for CPU Gain and Storage boost. These variables may be used by admin in game or by tester to faster unlock abilities.
+ Slightly nerfed APC CPU power generation.
+ Reworked machine overload. Now it only works on machines which are powered. Unpowered or broken machines cannot be overloaded. /obj/machinery/power type machines (APCs, SMESs, overall most stuff that directly handles electricity) received bonus explosion strength to compensate. Machine overload also drains massive power from local APC, therefore preventing spam of this ability (normal APC should take about 2-3 of these before needing to recharge). Also, qdel instead of del.
+ System Override now uses shuffled list of APCs when hacking them, as opposed to alphabetical list.
+ CPU generation rate is now shown in Status tab.
2015-05-11 06:36:44 +02:00
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
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
2adc8df1fa
Merge pull request #8903 from Mloc/lightwrite
...
Lighting rewrite
2015-05-11 09:26:04 +09:30
ea28e4aadf
Merge pull request #9126 from Techhead0/magbootsOverShoesTwo
...
Magboots can be worn over shoes
2015-05-11 02:48:45 +03:00
7780287d3a
mood lighting for computers
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:29 +01:00
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
b0d10a6508
Fixes some stuff (+2 squashed commit)
...
Squashed commit:
[f63e170] Removes unnecessary /
[ac1b52c] re adds 1 bear trap i somehow accidently removed
2015-05-10 20:43:36 +01:00
86bf94ba07
Refactors bear traps
2015-05-10 20:09:29 +01:00
144b11ed14
Adds announcement to the space vine event.
2015-05-10 20:40:49 +02:00
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
895e78df1e
more lightweight camera caching
...
no loops
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:30 +01:00
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
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
fb8812d1b7
Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor
...
fixup
2015-05-10 17:54:34 +02:00
6b57189076
Merge pull request #9171 from PsiOmegaDelta/DroneSplosion
...
Fixes #9169 .
2015-05-10 18:06:22 +03:00
6e003e6d99
Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime
...
Grabs no longer endless loop runtime.
2015-05-10 23:20:56 +09:30
fff5ea7840
Grabs no longer endless loop runtime.
2015-05-10 12:11:52 +02:00
929e64311e
Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions
...
Enforces antagHUD restrictions.
2015-05-10 06:03:36 -04:00
647298e550
Fixes #9169 .
...
Drones can now survive entering chargers and being picked up.
2015-05-10 10:52:56 +02:00
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
6906acf193
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two
...
Conflicts:
code/game/turfs/simulated/floor.dm
icons/mob/back.dmi
maps/exodus-3.dmm
polaris.dme
2015-05-10 04:21:37 -04:00
928b0a8be5
Merge pull request #9162 from volas/admin_stuff3
...
Admin dice
2015-05-10 10:11:29 +02:00
753d63439c
Removes the leading comma in software.dm.
2015-05-10 02:24:10 -05:00
a0f119b9dc
Admin dice
2015-05-10 10:11:07 +03:00
34eb2872b6
Makes the code compile by adding a comma and removing some unused lines.
2015-05-10 02:03:28 -05:00
c0bb92bf34
Merge pull request #9146 from PsiOmegaDelta/AlarmConsoles
...
Station alarm monitor changes.
2015-05-10 15:37:50 +09:30
90fd4d584e
Merge pull request #9164 from comma/sterile
...
Made sterile gloves actually start sterile
2015-05-10 15:11:29 +09:30
Zuhayr