Commit Graph

27533 Commits

Author SHA1 Message Date
PKPenguin321
263afa7df4 Teleprods fixes (#17965)
* fixes teleprods creating igniters

* undoes rogue dme change
2016-05-27 21:32:01 -05:00
Cheridan
b18bbf309c Merge pull request #17888 from RemieRichards/crafting-tgui
Converts personal crafting to a TGUI interface.
2016-05-27 20:55:01 -05:00
Cheridan
a43394278f Merge pull request #17963 from PKPenguin321/patch-5
removes duplicate definition
2016-05-27 20:51:33 -05:00
Remie Richards
80b4c3ca7f Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui
Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js
2016-05-28 00:24:58 +01:00
Cheridan
edac9e2171 Merge pull request #17901 from MrPerson/bawhoppen_copyen
Removes some obselete attackby() code [Removes attackby crafting]
2016-05-27 18:02:42 -05:00
Cheridan
e687795914 Merge pull request #17959 from blobbernaut/capsulefix
Prevents bluespace capsules from breaking the escape shuttle
2016-05-27 17:46:51 -05:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949)
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
2016-05-27 22:16:21 +02:00
Joan Lung
b61d1fd81f Merge pull request #17941 from Cheridan/cleaning_vomit
Ends Flyman Starvation
2016-05-27 16:14:03 -04:00
Cheridan
27825e6584 Merge pull request #17930 from ChangelingRain/tabling
Fixes glass tables not producing debris when broken
2016-05-27 15:03:35 -05:00
Cheridan
f3ef584a6c Merge pull request #17835 from LanCartwright/chokingruntime
fixes choking.dm runtime due to new viruses
2016-05-27 14:56:10 -05:00
Cheridan
ff91cdf074 Merge pull request #17955 from phil235/BookBinderWrench
Book binder can be unanchored with wrench
2016-05-27 14:23:21 -05:00
Cheridan
2e74d742ad Themself 2016-05-27 14:08:47 -05:00
Cheridan
e92a4bc744 no src 2016-05-27 14:03:22 -05:00
MrPerson
30edfe2570 Removes flamethrower slapcrafting 2016-05-26 19:15:38 -07:00
Cheridan
61c83be5d9 Merge pull request #17935 from KorPhaeron/thecure
Cures zombies
2016-05-26 20:13:55 -05:00
oranges
1c917de28c Merge pull request #17939 from Cheridan/ruinspam
Loading Ruins... Ruins Loaded. Loading Ruins...
2016-05-27 12:46:06 +12:00
Cheridan
fcfa5dff6d flag memes 2016-05-26 19:36:57 -05:00
PKPenguin321
238971e1a8 removes duplicate definition
Fixes https://github.com/tgstation/tgstation/issues/17961
2016-05-26 17:34:40 -07:00
blobbernaut
c214909b7c actually this is cleaner
removes some useless redefinitions
2016-05-26 18:26:31 -04:00
Cheridan
d5a95e093b Merge pull request #17896 from phil235/PullvsGrab
Merges Pull and Grab into a single functionality.
2016-05-26 15:51:46 -05:00
phil235
c6d55955e7 let's not have the paper forever stuck in case of power outage. 2016-05-26 22:23:24 +02:00
phil235
ca3cf7475e Book binder machine is now wrenchable to move it. 2016-05-26 22:14:51 +02:00
coiax
c1104797df Removes gatling gun from R&D (#17629)
This isn't even remotely balanced; at least xrays had a limited magazine
and needed recharging.

🆑 coiax
rscdel: Gatling gun removed from R&D for pressing ceremonial reasons.
/🆑
2016-05-26 14:50:16 -05:00
KorPhaeron
a78679a8c4 Fine keep your damn zombies 2016-05-26 14:10:59 -05:00
Jack Edge
05d23faeaa Rounds no longer end instantly
I think I learned a valuable lesson today about how changing numerical
modes should be tested.
2016-05-26 16:43:24 +01:00
coiax
4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
Razharas
1393b64aeb Merge pull request #17906 from coiax/no-react-refactor
Refactors NOREACT flag; minor cig refactor
2016-05-26 16:09:57 +03:00
Jack Edge
bc113b6aa2 Refactors NOREACT flag; minor cig refactor
The reagents datum now has its own flags, which currently includes
REAGENT_NOREACT, which functions in the same way. Shouldn't be touched
directly, use set_reacting(bool) to modify it, as modification also adds
or removes the reagents datum from the SSobj.processing list.

Also refactors cigs a little, adds a Destroy(), uses the open_flame()
proc for the hotspot exposure.
2016-05-26 10:12:59 +01:00
Cheridan
0664f17c34 Makes flies only barf 1 tile ahead
2 tiles was too fun.
2016-05-26 01:16:28 -05:00
Cheridan
b6cd3b0deb Ends Flyman Starvation 2016-05-26 00:59:21 -05:00
Cheridan
7357479bed worstcoder 2016-05-25 22:03:38 -05:00
Cheridan
45a13b7179 Loading Ruins... Ruins Loaded. Loading Ruins... 2016-05-25 21:50:05 -05:00
Jordie
91e7bd52ac Merge pull request #17909 from KorPhaeron/brain
Fix for fiery dismemberment
2016-05-26 10:13:35 +10:00
KorPhaeron
3ec4b2bf23 Cures zombies 2016-05-25 18:40:28 -05:00
phil235
d9153f61b1 derp 2016-05-26 00:42:13 +02:00
phil235
fdc2228302 Fixes grab uses in Ratvar gamemode and changeling's hivemind link.
Also a typo.
2016-05-26 00:33:25 +02:00
phil235
129295be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into PullvsGrab
Conflicts:
	code/__DEFINES/misc.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm
2016-05-25 23:48:00 +02:00
phil235
4b4bbb28cc can't choke people with breathing tubes.
another tiny fix with tablepush.
2016-05-25 23:22:03 +02:00
coiax
57f22f8375 Swarmer teleport refactored; handcuff message fix (#17913)
Fixes #17912.

🆑
bugfix: Fixes a bug where swarmers teleporting humans would incorrect
display a visible message about restraints breaking.
/🆑

- Added a find_safe_turf() global proc in teleport.dm
- Also rewrote it to involve less awful indent chains
- Removed a trailing return for Remie
2016-05-25 23:06:44 +02:00
Joan Lung
b19fbc4c5d Tweaks some layering (#17900) 2016-05-25 22:42:48 +02:00
Joan Lung
e021806f4c Swooping drakes are now properly immune to damage (#17893) 2016-05-25 22:41:19 +02:00
Nerd Lord
eeb7d43730 It's a style thing 2016-05-25 12:05:23 -04:00
Nerd Lord
8f138abaf4 INSIDE the parenthesis! augh! 2016-05-25 12:01:55 -04:00
Nerd Lord
ab59c4cc78 Fixes glass tables not producing debris 2016-05-25 12:00:04 -04:00
oranges
bc61c8a13d Merge pull request #17904 from coiax/renaming-the-annoying-ones
Renames files under code/ with naughty characters
2016-05-26 01:39:56 +12:00
oranges
34e8a1f100 Merge pull request #17915 from tgstation/RemieRichards-lists
Adds a DEFAULTPICK() macro, updates an old list helper
2016-05-26 01:39:26 +12:00
Nyvrem
19caf6c130 Fixes mop wetness stacks (#17850)
* Fixes mop wetness stacks

Mops currently apply ten times as much liquid as they use and because wetness and lube and the such now stacks this means when you apply something with a mop it takes ten times as long to dry as it would otherwise.

* Fixes lacking wetting
2016-05-25 13:23:54 +02:00
Cheridan
c3df38a2bc Merge pull request #17926 from coiax/fix-17925
Fixes observers being called ghost
2016-05-25 01:37:09 -05:00
Cheridan
92d1ae5a4b Merge pull request #17881 from coiax/time-of-death
Polymorph bugs, time since death, groundwork laid
2016-05-25 01:29:44 -05:00
Jack Edge
5478a81ee4 foodndrinks to food_and_drinks 2016-05-25 06:26:28 +01:00