38beaaf75c
Updates
2014-09-02 01:24:54 +02:00
7eddda88d0
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into mineralfloors
2014-09-01 23:53:41 +02:00
837d5bc7eb
Merge pull request #4456 from Ikarrus/table_prints
...
Fingerprints for Cables and Tables
2014-08-31 17:11:14 +01:00
e25affe12e
Merge pull request #4337 from Miauw62/say()
...
[READY] Saycode rewrite
2014-08-31 10:59:04 -05:00
834f9a05b9
Mineral flooring
2014-08-31 17:12:17 +02:00
6176d845f0
fixes some stuff gia told me to fix
2014-08-31 14:27:40 +02:00
78a9b0be69
Merge branch 'master' of https://github.com/tgstation/-tg-station into say()
...
Conflicts:
code/__HELPERS/game.dm
code/game/gamemodes/cult/runes.dm
code/game/machinery/requests_console.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/objects/items/devices/PDA/radio.dm
code/game/objects/items/devices/aicard.dm
code/modules/admin/admin_verbs.dm
code/modules/assembly/holder.dm
code/modules/assembly/voice.dm
code/modules/mob/living/carbon/brain/brain.dm
code/modules/mob/living/carbon/human/whisper.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/say.dm
2014-08-31 13:40:16 +02:00
c788df4d6e
Merge pull request #4596 from Jordie0608/greenisthecolorofdiseaseandirish
...
[MAP] Fixes #3147 Greens Viro, fixes building glass med airlocks
2014-08-31 12:34:34 +01:00
ac4b0954f0
Merge pull request #4587 from Firecage/showerloggingprints
...
Shower logging and prints
2014-08-31 12:32:31 +01:00
492a043f47
fixed reinforced tables
...
Fixes not being able to place wrenches on (unweakened) reinforced
tables. The return statement in the conditional for the wrench in
attackby was preventing control from reaching the conditional later on
that places the wrench on the table. The conditional for the wrench now
checks if it can destroy the table, and if not it continues down to
where it is then placed on the table. table_destroy is now guaranteed to
destroy the table. Also removed the now redundant check in table_destroy
and made it more portable between different kinds of tables. Also fixed
an obvious typo.
2014-08-28 20:02:55 +03:00
4d14bd2dc6
Greens Viro, fixes building glass med airlocks
2014-08-28 23:00:21 +10:00
f20c97b59e
Updates to shower
2014-08-28 12:02:36 +02:00
bc2b8d0d5d
DONE DONE DONE DONE DONE DONE
2014-08-27 17:40:26 +02:00
465f23e184
The shower will now both log it and add hidden fingerprints when you wrench it to change the temperature.
2014-08-27 16:37:39 +02:00
0198ec2bde
Merge pull request #4576 from Firecage/SPANCLASSES
...
SPANCLASSES!!!!!
2014-08-26 15:05:12 -05:00
93e5918abc
Merge pull request #4381 from Ikarrus/burglaralarm
...
Burglar Alarm for Captain's Display Case
2014-08-26 19:36:04 +02:00
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
e3c0b2fa43
AHAHAHAHAHAHHAHAHAHAHASDHHADFHEUAHGUIHGDGIJDOINGEIOKILLTHEMALL
2014-08-24 20:35:49 +02:00
d0a1eae3f9
Merge pull request #4517 from Firecage/fixchamproj
...
This fixes the chameleon projector.
2014-08-24 13:02:50 +01:00
f0a8437231
Merge pull request #4457 from Ikarrus/falsewall_cheese
...
Mobs will block false walls from closing
2014-08-24 13:00:50 +01:00
944966ba93
Merge pull request #4520 from Firecage/Messagefixes
...
This fixes the message issues
2014-08-24 12:59:52 +01:00
f704c320d7
More saycode bugfixing, adds a saycode readme, etc.
2014-08-23 16:21:02 +02:00
b33320e6b6
Merge pull request #4514 from Firecage/fix1
...
Fix for 1 use freedom implant
2014-08-22 09:52:34 -05:00
6b1cae6904
Merge pull request #4460 from Ikarrus/deathsquad
...
Adds Deathsquad to Quick-Create Antagonist Menu
2014-08-22 08:26:09 +01:00
a7c0ca8dfd
Merge pull request #4506 from Jordie0608/itsawondernanotrasendoesntreplaceweldingfuelwithsomethinglessvolatile
...
Makes welderbombs use fueltank's ex_act
2014-08-21 22:14:13 -05:00
0891744c8e
Resolved Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
2014-08-21 19:47:30 -06:00
4198e61af1
This fixes the message issues
2014-08-22 01:15:13 +02:00
9df78f3681
This fixes the chameleon projector.
2014-08-21 17:02:13 +02:00
f5c3d0b9cf
Fix for 1 use freedom implant
2014-08-21 16:11:26 +02:00
f17200bc7f
Makes welderbombs use fueltank's ex_act
2014-08-21 00:56:17 +10:00
8c910a3b10
Merge pull request #4414 from Lo6a4evskiy/2014-08-14-Welding-lockers
...
Fixes for welders and lockers
2014-08-19 12:28:58 +02:00
dbb7fd9ffe
Locker should be open for cutting apart
2014-08-19 13:56:27 +04:00
99fae13391
Merge pull request #4393 from paprka/emptyclick
...
Empty gun click noise
2014-08-19 10:36:06 +01:00
c8bd6af8bf
Merge pull request #4480 from Incoming5643/statuefix
...
fixes #4479
2014-08-19 10:20:56 +01:00
0be874efff
-Added proc for setting the flashing red alarm lights
...
-moved all the Related Areas checking for fire alarms into the procs in areas.dm
-Added sound for burglar alarm due to popular request
2014-08-18 21:27:42 -06:00
5e696e9cd7
Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot
...
Dynamic maintenance loot table and map modification.
2014-08-18 19:27:02 +02:00
5765a2e2cb
Resolves many, more saycode bugs. AI tracking is still broken.
2014-08-18 18:51:07 +02:00
5c5e54342d
Merge pull request #4470 from Ikarrus/gibsounds
...
Added a sound for Gibbing
2014-08-18 08:03:47 +01:00
68bcb4dbbd
fixes #4479
2014-08-17 23:55:26 -04:00
7fb2e5351b
Removed flash from the maintenance loot table.
...
set armory_contraband to not spawn duplicates (as it initially was).
2014-08-18 05:41:52 +02:00
37f9716fb5
Added loot tables for the maintenance and the contraband locker (removed the map edit for now)
2014-08-18 05:40:15 +02:00
b0f0d01d36
Merge pull request #4427 from Cheridan/blow_up
...
Advanced Shotshells
2014-08-17 15:35:08 -03:00
80dea1edb3
Now it only checks if closet is open at the moment of welding. Also removed useless message.
2014-08-17 18:17:48 +04:00
7413f743c8
Merge pull request #4451 from Firecage/structureabsolutes
...
absolute paths for the structure folder files
2014-08-17 13:45:13 +01:00
433262e5e0
Removes debug messages.
2014-08-17 12:58:03 +02:00
be077176ee
Used the gibspawner instead
2014-08-16 19:17:39 -06:00
1fef6effc3
RADIO CODE WORKS NOW HOLY SHIT
...
(warning, contains tons of debug messages that still need removal)
2014-08-16 20:33:50 +02:00
3fd2886eb0
Merge pull request #4420 from Lo6a4evskiy/2014-08-14-Broken-grilles
...
Broken grilles will not spawn rods when hit
2014-08-16 13:39:35 +01:00
09071b88d5
Merge pull request #4357 from paprka/nerfninja
...
Makes ninja less stupidly broken (balancing)
2014-08-16 04:13:49 -07:00
d56274a4ab
Adds Deathsquad to Quick-Create Antagonist Menu
...
-Pressing this button will spawn up to 5 death commandos on centcom with a customizable objective
-Added a shuttle console to the ferry that, rather than moving the shuttle, will send a request to admins instead
-Deathsquaddies get an energy shield
-Deathsquad beret will no longer hide head, face, and hair
2014-08-16 00:40:37 -06:00
Firecage
Alex
Cheridan
Miauw
Joonatan O'Rourke
Jordie0608
ikarrus
Lo6a4evskiy
Incoming
KyrahAbattoir
Aranclanos
MrPerson