79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
11f6c7c401
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-12 04:51:16 +03:00
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
98a865298a
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/mecha/mech_fabricator.dm
2014-12-11 13:53:37 -08:00
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
27793609d8
Merge pull request #6201 from fleure/togglefix
...
Fixes toggling watertank nozzle in hands with verb
2014-12-11 12:21:32 -06:00
3ede77face
Merge pull request #6189 from Menshin/exofab_revamp_end+fixes
...
Exofab revamp finishing and fixes
2014-12-11 11:52:16 -06:00
ece2bb00c3
Merge pull request #6242 from Dorsisdwarf/RCDbuff
...
Buffs the RCD
2014-12-10 06:23:28 -06:00
99f364f480
makes APC call parent
2014-12-09 18:53:29 -08:00
f34fcd6124
overrides attack
2014-12-09 18:10:17 -08:00
af3f1aa4d8
Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor
...
Conflicts:
code/game/machinery/deployable.dm
code/game/objects/items/weapons/storage/lockbox.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/modules/clothing/glasses/hud.dm
code/modules/mob/living/silicon/robot/robot.dm
2014-12-09 16:03:45 -08:00
4237c406e4
Merge branch 'master' of https://github.com/tgstation/-tg-station into fashionandfashionaccesories
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
2014-12-08 13:53:31 -03:00
12279d9c8e
Adds a santa event where a dead player is spawned as Santa! HO HO HO!
...
Also adds a few more things to the random gifts.
2014-12-08 17:03:52 +01:00
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
bff2e62a0f
Merge pull request #6175 from Razharas/ExActFix
...
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
65bdf75fc0
Adds changelog and nerfs door deconstruction.
2014-12-07 11:46:59 +00:00
eeea775d67
Merge pull request #6188 from tkdrg/miauwpls
...
Fixes the new AI lawcap config option
2014-12-06 23:55:15 +00:00
931bddc657
actually fixes the description
2014-12-06 11:41:35 +00:00
77106e033b
Updates description and capacity variable
2014-12-06 11:38:15 +00:00
6149d834f7
Buffs the RCD
2014-12-06 11:24:13 +00:00
fb6e756502
Defib sounds plus Code
...
Defibt sounds added plus code edits to accept new defib sounds and new weapon sounds
Defib previews
https://dl.dropboxusercontent.com/u/9654207/def_saftyOff.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_charge.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_failed.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_ready.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_SaftyOn.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_success.ogg
https://dl.dropboxusercontent.com/u/9654207/defib_zap.ogg
2014-12-05 22:18:34 -08:00
7758a0afed
Ok now explosions shall work properly
...
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
3330b991ed
Merge pull request #6034 from Jordie0608/whatwerethechancesofthishappening
...
Makes dice use overlays
2014-12-05 10:15:45 -06:00
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
acd956179b
Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-12-04 20:47:29 -03:00
f909d59d1a
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
...
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
08d28b4f47
Fixes various issues with Backpack Watertanks / Defibs by slapping NODROP on them
...
Changes all watertanks and the defib to use the Atmos watertank equip method
Fixes a runtime that could happen if someone melted the Atmos watertank off of you
2014-12-04 09:27:10 -08:00
3d6a4a7bfb
Fixes toggling watertank nozzle in hands with verb
2014-12-03 18:58:08 +00:00
dcb48e3168
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpanFix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-12-03 18:59:32 +01:00
1d6a7cf031
Merge pull request #6106 from Razharas/StorageFix
...
Fix for storages and equip
2014-12-03 17:50:58 +01:00
88ad308825
Merge pull request #6144 from Menshin/storage_calling_super
...
Made obj/item/weapon/storage call ..() on New()
2014-12-03 16:38:43 +00:00
ba44b325d3
Finished the exofab revamp:
...
* designs are now using the construction time var and the hacky /obj/item/mechavars is gone
* designs updated : there shouldn't be "no material" designs anymore
* cleaned the objects of their construction_cost and construction_time vars
* fixes the material name being displayed with $ character before
* this also fixes the overlay animation in inserting sheets
* the category var is now a list, so parts can be build/used with several chassis (fixes the Firefighter Chassis appearing when building Ripley)
* properly fix the href vulnerability when emptying (you can now remove all sheets of a materiel at once)
* the exofab now won't create a material sheet if there's not enough material (e.g 1000 metal)
* the exofab now won't accept a sheet if it would overstuff it (losing some material in the process)
* cleaned the code a bit (simplified, streamlined, using global vars, etc)
Finish #5722 and fixes #5954 .
2014-12-02 23:00:22 +01:00
6194c0b90f
Fixes the new AI lawcap config option
...
Previously, it would include null entries in some of the lists, which
meant that the total law amount would be grossly exaggerated.
Fixes #5846
2014-12-02 18:27:06 -03:00
260ee75c9a
Fixes several description related issues with fancy storage
2014-11-30 22:03:25 +00:00
efb50e374a
Made obj/item/weapon/storage call ..() on New()
2014-11-30 03:14:49 +01:00
42973c8b67
Goon Chemistry Commit 2
2014-11-29 17:15:57 -08:00
7f357963bd
- Fixes belts getting stuck in drone inventory. Fixes #5563 .
...
- Gives drones the ability to interact with APCs and air alarms without requiring them to have an ID card. Fixes #5565 .
- Drones have to be adjacent to the APC/alarm when using it, for balance.
2014-11-29 14:36:36 +02:00
9ea01e3e44
Merge pull request #6107 from tkdrg/runtimesfuntimes
...
Fixes pacid chem grenade runtime
2014-11-28 16:35:01 -08:00
22e0771eb9
Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs.
2014-11-28 16:08:59 +01:00
9e0d8c6ef6
Merge pull request #6094 from tkdrg/cuffmsg
...
Adds some feedback messages for handcuffing
2014-11-28 15:13:36 +03:00
b573a00f5e
Merge pull request #5918 from Razharas/Cfour
...
Who am i kidding, its explosions rework for a long time already
2014-11-27 13:58:56 -08:00
bc7a7a7452
Merge pull request #6084 from tkdrg/hudindahood
...
Fixes data/antag HUD bugs
2014-11-27 13:50:34 -08:00
d2848e5f95
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-28 00:32:30 +03:00
30477f00c4
Fixes pacid chem grenade runtime
2014-11-27 13:51:45 -03:00
876a5b1bfb
Fix for storages and equip
...
Yeah
2014-11-27 19:28:03 +03:00
7153becc62
Fixes implants not updating the implant secHUD
...
Makes med huds /carbon because of monkeys
Makes HUDs update after implant removal surgery
Fixes cloning not recovering antag huds
2014-11-27 12:56:17 -03:00
275d7fdd77
Merge pull request #6038 from paprka/hatfix
...
fixes head of security and warden hat flashbang confusion
2014-11-27 17:14:51 +03:00
c5209f2399
Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
2014-11-27 15:30:37 +03:00
afbc910505
Adds some feedback messages for handcuffing.
2014-11-26 21:27:53 -03:00
7bfd789b4d
Merge pull request #5959 from tkdrg/boxin
...
Makes storage items update properly on insertion
2014-11-26 11:05:09 -08:00
tkdrg
Razharas
Hornygranny
paprka
Cheridan
Miauw
Dorsisdwarf
Remie Richards
Cuboos
Ergovisavi
fleure
phil235
Menshin
xxalpha
iamgoofball
Perakp
Razharas