b9cdb3384a
Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
...
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
56d4bf61b2
Merge pull request #10073 from Jordie0608/whoknowswherewewouldbewithoutcartography
...
Fixes #10052 , stat checks for child update_icon()
2015-06-24 11:17:48 -05:00
58399f7602
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
icons/obj/items.dmi
2015-06-24 20:31:51 +10:00
a8ec1c76df
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
...
Conflicts:
code/ATMOSPHERICS/atmospherics.dm
code/game/machinery/computer/computer.dm
code/game/objects/items/weapons/explosives.dm
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/musician.dm
code/game/objects/structures/tables_racks.dm
code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
cc8467972c
stat checks for update_icon
2015-06-21 21:31:14 +10:00
c79963f7b7
Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
...
Malf AI module changes + Mechs for normal AIs!
2015-06-21 00:30:03 +01:00
25445e5a05
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-06-20 17:32:16 +10:00
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
a372b6ffc7
Merge pull request #9940 from Ikarrus/deptmanagement
...
[Boxstation Edit] Department Management Console
2015-06-17 19:46:44 +02:00
79df97a93d
Merge pull request #9819 from HoaxIT/patch-1
...
This prevents #9809 from being abused.
2015-06-17 14:26:18 +02:00
76ff6747d7
Merge pull request #9936 from Ikarrus/usecommsoncentcom
...
You can use the communications console on Z2
2015-06-17 13:58:34 +02:00
9a1c1ae7af
Merge pull request #9967 from Jordie0608/figurediwouldvemissedsome
...
Fixes computer icon errors
2015-06-16 11:30:44 +02:00
24bcdf24b0
fixes procomp iie icon
2015-06-16 17:43:27 +10:00
0bf6f09969
Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
...
Conflicts:
code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
fd27d9d3bb
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/gamemodes/malfunction/Malf_Modules.dm
2015-06-15 12:26:28 -05:00
bc11259282
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/machinery/computer/aifixer.dm
2015-06-15 11:27:11 -05:00
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
a00e11520c
Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
2015-06-14 15:42:15 -07:00
ec8cd61d4c
Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
...
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
e44b184075
Merge branch 'master' of https://github.com/tgstation/-tg-station into deptmanagement
...
Resolved Conflicts:
code/game/machinery/computer/card.dm
icons/obj/computer.dmi
2015-06-14 09:50:56 -06:00
565e4dda5a
Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
...
Overlays for computers
2015-06-14 10:25:27 -05:00
a67de221cc
JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging
2015-06-14 23:37:35 +10:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
c2256d41fc
BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH
2015-06-13 13:58:08 -07:00
75a311dc8c
Department Management Console
...
Originally conceived to manage budgets that can be used to buy things from cargo without their approval. But now it's just a limited ID console, but available in every Command Staffer's office.
- Can only modify access to their own department, regardless of what ID is used to log in
- Any department head can use these to promote/demote those in their department, including those who have access that you clearly do not remember authorizing
- Can be modified to change the access of other departments by using a multitool on the circuit board.
2015-06-13 12:55:24 -06:00
6bafd88ced
ZLEVEL_CENTCOM
2015-06-13 10:39:01 -06:00
e1c99bc27a
You can use the communications console on Z2
...
Mostly so Captains can continue to make announcements.
2015-06-13 10:33:05 -06:00
3e07dbc5a9
Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
...
Conflicts:
icons/obj/chemical.dmi
2015-06-13 20:23:29 +10:00
db087e493d
accidently converted eol here when i shouldn't've
2015-06-13 20:18:21 +10:00
752f5e883d
eol conversion
2015-06-13 20:15:49 +10:00
5ef93b2225
overlays for computers
2015-06-13 20:07:48 +10:00
595bb0c8e4
Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
...
Random lizard bodies will finally have color!
Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.
Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
d559957683
Adds Ban to name_action list.
2015-06-10 10:18:12 -05:00
77b2e54de7
code improvement and overlays for fancy storage, dropper, syringe and lighter
2015-06-10 18:58:19 +10:00
7ddcbb1967
Tweak and fixes
...
- Made the interactions into defines.
- Fixed a runtime for when an AI tries to set a DNA lock.
2015-06-09 14:45:38 -05:00
1c2f2bd7f4
Adds Sound Effects to Arcade RPG
2015-06-08 23:34:19 -05:00
d3fbacc224
Tweaks
...
- Sorts out the transfer_ai() proc, it can now be added to practically
anything you wanted to give to an AI.
- Moved mech functions to the unused middle click.
2015-06-08 20:46:01 -05:00
46a4d6fe8f
Adds PDA-Message Photo Attachment
2015-06-08 17:40:24 +02:00
bff351c555
Intergrates lizard parts into dna stuff so changelings can properly steal them.
...
Turns all the lizard options into one associated list instead of their own vars, for tidiness
Shuffles horns behind frills in terms of layering
2015-06-07 21:05:34 -04:00
f62fb1c478
special snowflake.
2015-06-06 21:01:27 +02:00
b74c2c7e7c
Switched sanitize calls around.
2015-06-06 20:59:34 +02:00
17fc2bdeea
Another html injection bites the dust.
2015-06-06 18:12:11 +02:00
4e028b8b13
This prevents #9809 from being abused.
2015-06-06 18:10:46 +02:00
dd882605a8
Now uses remote_control
...
Little code shuffling to use remote_control var.
2015-06-04 19:55:31 -05:00
bbd97d9055
Nerfs Lockdown, Adds Mechjacking, Buffs UpgTurret
...
- Nerfs Hostile Lockdown. One time use, lasts 60 seconds, cost doubled,
more obvious.
- Adds Malf AI mech jacking
- Adds ability to upload carded AIs to mechs.
- Buffs Upgrade Turret to use heavy lasers instead of simply shooting
faster.
2015-06-04 12:31:43 -05:00
b655ade95e
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/mecha/mecha.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-06-04 08:40:42 -05:00
a19f1801ff
Merge pull request #9699 from KorPhaeron/turf
...
Changes how destroying/building turfs works
2015-06-02 23:15:42 -05:00
Cheridan
Jordie0608
Iamgoofball
Remie Richards
phil235
GunHog
xxalpha
Ikarrus
kingofkosmos
Incoming
AnturK
HoaxIT