Commit Graph

13289 Commits

Author SHA1 Message Date
tkdrg
4e134df3fd Merge pull request #6661 from Menshin/bend_pipes_atmos_fixes
Atmos pipes fixes and tweaks
2014-12-31 20:18:53 -03:00
tkdrg
cdb5066502 Merge pull request #6324 from Razharas/GenShit
Added datum mutations
2014-12-31 17:24:15 -03:00
tkdrg
2dea549a25 Merge pull request #6683 from joonoro/master
Fixes arcade machine runtimes from #6351
2014-12-31 16:20:15 -03:00
tkdrg
cb5428c554 Merge pull request #6685 from phil235/VisibleLingMsgFix
Fixes people getting the Ling's message when he reassimilates its armblade/shield.
2014-12-31 16:06:00 -03:00
tkdrg
877f90c11a Merge pull request #6655 from phil235/SawnoffFix
Fixes shortening gun barrel
2014-12-31 15:11:27 -03:00
Menshin
b4e3b942db Removed a useless call to ..() in obj/pipe attack_by 2014-12-31 17:34:47 +01:00
phil235
286a9ce4bc Merge pull request #6657 from Lo6a4evskiy/Eyepatch_HUD_fix
All sec HUDs work properly with examine buttons
2014-12-31 15:45:40 +01:00
phil235
6cf7cd2c0b Merge pull request #6671 from tkdrg/fuckingSuperMatter-i_SwearTo=god'ThisdamnthingaaA
Fixes supermatter division by zero runtime
2014-12-31 15:42:10 +01:00
phil235
e476074b32 Merge pull request #6673 from GunHog/FixForTatorAIRadioAndRemovesSpice
Fixes #6654
2014-12-31 15:41:17 +01:00
phil235
3ce15f31b0 Merge pull request #6672 from Menshin/flash_emp_runtime_fix
Fixes flashes runtiming on EMP + flash spamming
2014-12-31 15:33:20 +01:00
Menshin
34cee3f088 Renamed confusing variable 2014-12-31 13:51:39 +01:00
phil235
183955a877 Fixes shortening barrel: only live chambered ammo goes off in your face; the gun goes off even if not in your hand; when blowing up "you fire the X" message won't show up anymore. 2014-12-31 12:04:39 +01:00
tkdrg
3752254766 Revert "Adds mouse pointers for different ui styles" 2014-12-31 02:17:50 -03:00
phil235
cfff3cd375 Merge pull request #6539 from Xhuis/pounce_nerf
Nerfs alien hunter pounce
2014-12-31 02:29:15 +01:00
tkdrg
ff173b82b1 Merge pull request #6656 from Ergovisavi/mushroom_samba
Fixes mushrooms preying on non mushrooms
2014-12-30 21:35:46 -03:00
tkdrg
829ba09986 Merge pull request #6244 from Ergovisavi/halp_medics_griffon_me
Adds Medical Hologram functionality to Medical Penlight
2014-12-30 20:52:46 -03:00
tkdrg
2d7e10ec67 Merge pull request #6662 from Menshin/retractor_not_a_weapon
Fixes retractor autolathe spawning.
2014-12-30 20:44:55 -03:00
Xhuis
1c88fbf615 Adds 3-second cooldown to alien hunter pounce; only triggers if successful 2014-12-30 18:19:35 -05:00
joonoro
716e14f716 Fixes arcade machine runtimes from #6351 2014-12-30 21:11:22 +02:00
Ergovisavi
1329dbf3cb Merge pull request #6652 from AnturK/cleanup 2014-12-30 11:10:08 -08:00
phil235
008f0e1b16 Fixes blind people getting the Ling's message when he reassimilates his armblade/shield. 2014-12-30 18:59:15 +01:00
tkdrg
0d33cc98af Merge pull request #6660 from Firecage/Mineral_Floor_Effects
Adds effects for the following mineral floors: Plasma, Uranium, Bananium...
2014-12-30 13:18:25 -03:00
joonoro
663e7d673a Fixes arcade machine runtime from #6351 2014-12-30 17:33:52 +02:00
Razharas
d1f347f584 Fixes conflicts
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
Perakp
953aab610c Changes a few more checks to accept drones in addition to silicons. 2014-12-30 13:50:10 +02:00
Razharas
084d193409 Fixed dualsabers and hulks
Fixed dualsabers and hulks
2014-12-30 14:47:07 +03:00
Perakp
ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
Menshin
168b98840f Fixes flashes runtiming on emp_act()
Fixes flash messages spam (#6631)

Some code cleaning
2014-12-30 10:50:43 +01:00
tkdrg
2607a456c0 Merge pull request #6634 from paprka/chefuniform
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
Ergovisavi
f3251c7224 Adds a Medical Hologram functionality to the medical penlight 2014-12-29 21:44:44 -08:00
hornygranny
a9ea5e98a9 Update walls.dm 2014-12-29 20:31:47 -08:00
paprka
1cfdf56f0c fixes the switch checks 2014-12-29 19:29:31 -08:00
paprka
742d7b4383 IRON CHEF switches 2014-12-29 19:26:13 -08:00
hornygranny
9ee5d52814 Merge pull request #6601 from paprka/walkthecat
Adds catwalks
2014-12-29 19:05:41 -08:00
GunHog
4f3d955ca1 Fixes #6654
Sets the AI's encryption key to slot 2 so it is not lost upon the AI
being traitorized.
Fixes #6654 by reverting the change in #6399 to the AI's key.
2014-12-29 19:55:01 -06:00
tkdrg
bdbde78470 Fixes supermatter division by zero runtime 2014-12-29 21:48:21 -03:00
Firecage
6046e3ee2c Uranium Floor Rad Reducement 2014-12-30 00:04:29 +02:00
Firecage
427cdc6827 Final Mineral Floor Fixes 2014-12-29 23:58:41 +02:00
Firecage
a00370418e Plasma_floor_toxin_redux 2014-12-29 23:31:37 +02:00
Firecage
42fc6ce206 Mineral_floors_tkdrgadvice 2014-12-29 23:28:22 +02:00
Firecage
09bbc2356d Mineral floors SUPERed 2014-12-29 21:55:13 +02:00
tkdrg
78e5b9e7c7 Merge pull request #6616 from paprka/pointerpride
Adds mouse pointers for different ui styles
2014-12-29 16:47:07 -03:00
Menshin
a3f2d06b0b Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe. 2014-12-29 20:46:01 +01:00
Menshin
567bb27722 * Fixed unwrencheable atmos objects' stored pipe being wrongly created on New() because initialize directions weren't set when instanciating
* Fixed constructed unwrencheable atmos objects having a stored straight pipe , because dirs weren't set on instanciation
Those fixes, at least, bend pipes transforming into straight pipes on wrench/unwrench
* Fixed the digital valve pathing in some places
* Fixed bend pipes appearing as straight pipes when wrenched without connecting to anything

* Pipe colors are now preserved on wrenching/unwrenching
* Various clean-up of unaligned partially connected pipes icons
2014-12-29 20:34:13 +01:00
Ergovisavi
d7765cd75f Merge pull request #6630 from tkdrg/rpdcolor
Tested, appears to be functioning as advertised. Cue drones making absurd disposal rides.
2014-12-29 11:14:20 -08:00
tkdrg
df2271c300 Merge pull request #6640 from Nyvrem/master
Preferred colours for Podpeople
2014-12-29 15:00:01 -03:00
tkdrg
d96e8df573 Fixes some RPD bugs
Fixes pipe painting not working
Fixes 4-way manifolds and disposals chutes displaying broken icons
Fixes the lack of Sort Junctions from the RPD
Fixes #6627
Fixes drones being unable to use the RPD
2014-12-29 14:51:41 -03:00
Firecage
ad66ad69df Adds effects for the following mineral floors: Plasma, Uranium, Bananium. 2014-12-29 18:26:10 +02:00
Ergovisavi
f286d2602b Fixes mushrooms not being cannibals only 2014-12-29 07:28:30 -08:00
Lo6a4evskiy
9276e43e6e Fixes eyepatch and night vision HUDs not working with examine sec record buttons 2014-12-29 18:23:47 +04:00