Commit Graph

37019 Commits

Author SHA1 Message Date
Leo
acba8e53ab Merge pull request #28627 from Xhuis/button_lock
Action button QoL improvements
2017-06-21 09:45:48 -03:00
bawhoppen
b666bd58b0 Makes dressers buildable (#28611) 2017-06-21 09:45:04 -03:00
ClosingBracket
ed1855f5c8 Fixed small spelling + punctuation errors (#28631) 2017-06-21 09:43:59 -03:00
Mike Long
39103452a3 Lordpidey devil fixes (#28101)
* Fixes on #28051

* Changes hellfire around some, it's now more consistant.

* Fixes small exploit with infernal jaunt.

* Moves devil antag datum with the rest of the antag datums.

* Corrects syntax errors within codex gigas tgui template.

* Re updates tgui js after merge.

* removes redundant .loc from call.

* Fixes devils sometimes getting duplicate spells.
2017-06-21 10:47:02 +02:00
Jordan Brown
2a35e1c2ac Merge pull request #28588 from Ergovisavi/atmos_backpack_again
Changes to the Atmos Watertank Backpack
2017-06-20 21:49:02 -04:00
Ergovisavi
e1bdd83020 Changes the holo-fan to the holo-firelock, other minor changes and fixes 2017-06-20 18:36:45 -07:00
Jordan Brown
2fd25c63d6 Merge pull request #28618 from ExcessiveUseOfCobblestone/patch-4
Fixes shining lights into peoples eyes
2017-06-20 21:05:59 -04:00
Jordan Brown
6b4f2c03c6 Meh 2017-06-20 21:05:50 -04:00
Jordan Brown
c5e67b5ce1 Merge pull request #28619 from ChangelingRain/taserfix
Tasers and projectiles stun for the proper amount
2017-06-20 21:05:15 -04:00
Kyle Spier-Swenson
491bdace5d Makes movement delay calculation not round to the tick (#28616)
* Makes movement delay calculation not round to the tick

* Fix some fuckups

* How'd that get there

* With squash merging I don't have to feel ashamed about this commit message
2017-06-20 21:04:41 -04:00
bgobandit
078a1e45a6 Lavaland mushrooms and plants can now be cultivated. (#28533) 2017-06-20 20:05:31 -03:00
Leo
1965dfa0fe Merge pull request #28610 from Cyberboss/Cyberboss-patch-1
Round ID is now sent to IRC
2017-06-20 20:01:15 -03:00
Leo
fb366a6d22 Merge pull request #28613 from ohnopigeons/youregonnacarrythatweight
Fixes pimpin ride janicart (and other ridden vehicles) being spaceworthy
2017-06-20 20:00:49 -03:00
Leo
c7c2d55cb7 Merge pull request #28607 from Cyberboss/satchel
[s] Disables persistence saving in sandbox mode
2017-06-20 20:00:33 -03:00
Jordan Brown
6126cbe705 Merge pull request #28612 from Bawhoppen/3branch
Fixes grenade belt and bandolier UI obscuring half the screen
2017-06-20 16:36:23 -04:00
bawhoppen
bcb87d9135 truth 2017-06-20 15:25:51 -05:00
Jordan Brown
50f00bc023 Merge pull request #28603 from ChangelingRain/sleeptostatus
Sleeping is now a status effect
2017-06-20 16:22:34 -04:00
Tacolizard
fded49c639 Adds some custom force strings and fixes a bug (#28597)
* initial

* singuloth

* melee

* fix

* forgot a quote

* cyber1

* cyber2

* capitalization

* cyber3
2017-06-20 15:51:08 -04:00
Jordan Brown
6440a70ec2 Merge pull request #28605 from ChangelingRain/slipfix
Fixes slips
2017-06-20 15:49:45 -04:00
Jordan Brown
59a3865f60 Merge pull request #28600 from ChangelingRain/hiddenripley
Adds a heavily-damaged ripley as a lavaland ruin
2017-06-20 13:08:48 -04:00
AnturK
868d374fab Moves transit space to separate z level. (#28598)
* Transt Z-level

* Just in case

* Map edit

* I guess i forgot to push the few lines i changed at work.

* This one too

* Bluh
2017-06-20 11:31:32 -04:00
Jordan Brown
cc4bd7a0bc Merge pull request #28599 from Xhuis/disabler_inhand_fix
Disablers now have an in-hand sprite (Fixes #28582)
2017-06-20 11:30:45 -04:00
Lan
80380c59e7 Removes loot from Syndicate and Spaceport simple mobs. (#28123)
* Removes loot from Syndicate simple mobs.

* That can go too

* That can go too

* adds del_on_death as remie requested

* added taps to TRUE
2017-06-20 11:12:59 -04:00
Jordan Brown
edca3c06cd Merge pull request #28596 from Xhuis/luxury_capsule_fix
Luxury shelter capsules' display cases no longer spawn offhand objects (Fixes #28589)
2017-06-20 11:11:32 -04:00
kevinz000
d1108df80c [READY] The Portal Update - Linked portals, momentum conservation, and more! (#28055)
* THE PORTAL UPDATE

* portal gun checks

* damn functions

* o_range(s)

* Atmos Portals (#12)

* Rod Form's damage now scales with how much it's upgraded

* buffs chem grenades

* Fix getrev runtime

* Automatic changelog generation for PR #27948 [ci skip]

* Automatic changelog generation for PR #27951 [ci skip]

* Fixes admiral recall (#27861)

* the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978)

* Beam rifles now slowdown while scoped (#27898)

* Update beam_rifle.dm

* Update beam_rifle.dm

* Update beam_rifle.dm

* Fixes a very silly clockwork false wall trick (#27996)

* Fixes #27979 (#28002)

* Automatic changelog generation for PR #28002 [ci skip]

* Fixes #27989 : Riot suits no longer hide jumpsuits (#28003)

* Fixes #27989

* remove tag

* Automatic changelog generation for PR #28003 [ci skip]

* Refactors a cooldown var to not require a spawn or sleep (#28011)

* wat (#28012)

* Remove spawns in favour of stacktrace calls, which don't stop the called (#28013)

proc

* Refactor another spawned cooldown var (#28014)

* Come on, pathetic (#28015)

* Refactor another spawn cooldown (#28016)

* Goodbye spawn (#28017)

* Another spawn timer (#28018)

* Remove a commented out function (#28019)

* Gotta go with the fro2.0 (#28010)

* This doesn't do anything (#28020)

* refactor another spawn cooldown (#28022)

* Refactors another spawn cooldown var (#28023)

* Refactor another spawn (#28024)

* Refactor another spawn var (#28027)

* woops

* woops2

* atmos links!

* unused

* wew

* ffs!

* Forced updates

* update

* Update portals.dm

* adjacent/atmospass checks

* Create portals.dm

* Update portals.dm

* Update other_tools.dm

* stuff

* crossed

* documentation

* reee

* no portal stacking!

* woops
2017-06-20 11:02:01 -04:00
Jordan Brown
8125e875ea Merge pull request #28593 from ChangelingRain/abductorfix
Fixes abductors not being able to sleep people
2017-06-20 10:30:54 -04:00
Jordan Brown
4677feda99 Merge pull request #28594 from kevinz000/telecoms_1
Minor telecom code cleanup
2017-06-20 10:30:24 -04:00
kevinz000
d1250a16a1 Bluespace Artillery now requires keycard authentication to unlock controls (#28592)
* kor

* doot

* Update bsa.ract

* Update keycard_authentication.dm

* recompiled
2017-06-20 09:55:23 -04:00
Jordan Brown
1c8badd8fe Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
Jordan Brown
6f1a4e22b0 Merge pull request #28591 from lzimann/whydoweletpeopletouchthecodelikethis
Changes tooltip verbs to be on preferences tab
2017-06-20 09:20:48 -04:00
Xhuis
63d0f1c772 Action button QoL improvements 2017-06-20 00:27:39 -04:00
Jordan Brown
d2b5b45381 Merge pull request #28579 from KorPhaeron/soap
Chisel messages will be below objects
2017-06-19 23:07:12 -04:00
Jordan Brown
0234fede9e Merge pull request #28581 from ChangelingRain/fleshfrombone
Fixes improper text replacement of Fireball.ogg and FleshToStone.ogg
2017-06-19 23:06:38 -04:00
Jordan Brown
c2069e0446 Merge pull request #28583 from Xhuis/equip_delay_framework
Adds framework for equip delays and adds it to the straight jacket
2017-06-19 23:06:07 -04:00
oranges
186d17b77b Refactors hitreaction to pass in the hitting atom
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
nicbn
fce774d7ee Bay-like cryotube pods (#28350)
* Add files via upload

* Add files via upload

* Add files via upload

* Lowered open state glass alpha

* Now cryos have open icon

* and the code is fixed

* oops

* wrong path

* oops2

* Custom sprites for some mobs inside cryo

* More code

* Moar code commit, why not?
2017-06-19 22:42:39 -04:00
Jordan Brown
2328081b25 Merge pull request #28577 from Xhuis/freezer_heater_fix
Freezers and heaters now drop the correct materials (Fixes #28560)
2017-06-19 22:26:29 -04:00
Leo
cf6cbd9f9f Merge pull request #28571 from ChangelingRain/gatesound
Fixes the Ark's sound cutting out
2017-06-19 21:53:49 -03:00
Leo
42dffeed07 Merge pull request #28572 from Xhuis/zombie_revive_message_shrink
Reduces the size of the zombie revival flavor text (Fixes #28568)
2017-06-19 21:52:57 -03:00
Joan Lung
cad788efef Tasers and projectiles stun for the proper amount 2017-06-19 20:43:56 -04:00
ExcessiveUseOfCobblestone
bc841222b3 Update flashlight.dm 2017-06-19 19:39:23 -04:00
Pigeons
ccbe27f977 Removes pull check in Process-Spacemove in riding datum 2017-06-19 16:54:25 -04:00
Lularian
8d12c27499 belts 2017-06-19 15:46:47 -05:00
Jordan Brown
33420fc103 Round ID is now sent to IRC 2017-06-19 16:39:48 -04:00
Jordan Brown
dd6f13b6b3 Disables persistence saving in sandbox mode 2017-06-19 15:47:42 -04:00
Joan Lung
99a5230e62 fix that 2017-06-19 15:43:42 -04:00
Joan Lung
38ec5563dc Fixes slips 2017-06-19 14:57:25 -04:00
pigeons
bdc4c9412e Refactors PDA cartridge permissions (#28567)
* Refactors cartridge access into bitflags

* Adds BitCount helper

* refactors cartridge access in virus cartridge

* Adds comments to BitCount

* detonate -> detonatable for readability, undetonatable PDAs will no longer show they've successfully detonated after sending virus

* dumb

* edits

* .

* space
2017-06-19 14:56:41 -04:00
Joan Lung
563f66700c Sleeping is now a status effect 2017-06-19 14:47:35 -04:00
kevinz000
457467c749 Update machine_interactions.dm 2017-06-19 10:53:08 -07:00