coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,164 Commits 9 Branches 11 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

14295 Commits

Author SHA1 Message Date
Firecage d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
KorPhaeron 52ea5c5c63 Ranged Guardian 2016-01-18 22:09:00 -06:00
Razharas 6143894aae Merge pull request #14704 from AnturK/jetpacksareforlosers 
Fixes simple syndicates space move
 2016-01-19 03:48:31 +03:00
Razharas 9e1923cc52 Merge pull request #14694 from xxalpha/zhe 
Fixes covering clothing not hiding gender on examine()
 2016-01-19 03:46:35 +03:00
Razharas 3020846f97 Merge pull request #14692 from AnturK/rollforfixes 
Random Fixes
 2016-01-19 03:45:43 +03:00
duncathan salt 118af31dc3 Merge pull request #14699 from Razharas/GibFix 
Fixes ling armour being ungibbable
 2016-01-18 18:31:14 -06:00
tkdrg 0a6c050862 Merge pull request #14726 from neersighted/mo_tguis 
Hotfix for MULEs; half of the UIs
 2016-01-18 20:11:14 -03:00
Bjorn Neergaard 41caa93330 Hotfix for display issues and UIs droping ui_act calls 2016-01-18 17:00:15 -06:00
Bjorn Neergaard 09aff20b6f Hotfix for MULEs 2016-01-18 16:26:18 -06:00
duncathan salt ee1067cb5c Merge pull request #14686 from neersighted/mo_tguis 
Mo' tgui mo' commits
 2016-01-18 14:54:12 -06:00
Bjorn Neergaard aa8b6bfac2 Factor out radio helpers 2016-01-18 14:30:27 -06:00
Bjorn Neergaard 5cfc60d9da tgui radios; clean up frequency code 2016-01-18 14:28:33 -06:00
Bjorn Neergaard a1ff8e8783 Refactor tgui interactions 
Removes a lot of duplicated code, thanks to @nullquery's parent tweaks
 2016-01-18 14:27:56 -06:00
Bjorn Neergaard b33c6f216d Tidy tooltips; hide lock button from non-lockable uplinks 2016-01-18 14:27:34 -06:00
PKPenguin321 c8aa8721e8 fixes armcannon messages 
they were displaying to everybody instead of just the user because i misunderstood how messages work.
 2016-01-18 12:25:09 -08:00
Remie Richards 4840c69eb5 Merge pull request #14695 from Razharas/LootFix 
Fixes loot crates and animal attacks
 2016-01-18 20:22:33 +00:00
Bjorn Neergaard ff5d6292c8 tgui uplinks; repath uplinks 2016-01-18 14:22:00 -06:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard 0a7236d955 Allow relabeling any canister; port MULEbot to tgui 2016-01-18 14:21:56 -06:00
xxalpha 9a9aaabb8d Removed bot/Emag() proc. Silicons can't interface with human emagged bots. 2016-01-18 19:12:19 +00:00
Razharas afccde250c Further corrections to smeses 
Further corrections to smeses
 2016-01-18 17:10:35 +03:00
Razharas c71c01f4e9 Roundstart smes fix 
Roundstart smes fix
 2016-01-18 17:00:30 +03:00
Razharas b38fbf6401 Merge branch 'master' of https://github.com/tgstation/-tg-station into LootFix 2016-01-18 12:32:50 +03:00
Razharas f7ae437e74 Delete the crate instead of doing nothing 
Delete the crate instead of doing nothing
 2016-01-18 12:32:31 +03:00
xxalpha 577488e0d8 safepick 
more safepick
 2016-01-18 05:46:44 +00:00
Remie Richards cb647aa730 swaps position of newline character, Never produce PRs on a lack of sleep. 2016-01-18 01:30:34 +00:00
Remie Richards 83ef5bc47e newline formatting 2016-01-18 01:08:18 +00:00
tkdrg ace569e951 Merge pull request #14678 from Buggy123/patch-9 
Fixes energy ball Destroy()
 2016-01-17 22:05:03 -03:00
xxalpha af7059e1f3 Divide beach coast icon into two. 2016-01-17 23:26:43 +00:00
xxalpha 53b74da4bd Fixes the straightjacket 
More straightfixes
 2016-01-17 22:12:34 +00:00
AnturK a39de9eb6d Fixes simple syndicates space move 2016-01-17 22:47:42 +01:00
tkdrg 0ba3fdc3f2 Merge pull request #14675 from Razharas/BloodFix 
Makes some species disease immune
 2016-01-17 18:45:45 -03:00
Remie Richards def68f134c Missed an argument. 2016-01-17 20:20:35 +00:00
Remie Richards 65a60d438c Adds the ability for get_callproc_returnval() to spot assoc lists 2016-01-17 20:18:09 +00:00
Remie Richards 603bf4624c callproc now outputs the contents of returned lists instead of /list 
While it's useful to know when a /list has been returned, it's infinitely more useful to see that list's contents
 2016-01-17 20:12:51 +00:00
Razharas 21d62df0c6 Fixes ling armour being ungibbable 
Fixes ling armour being ungibbable
Fixes https://github.com/tgstation/-tg-station/issues/11388
 2016-01-17 20:37:04 +03:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage 332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Razharas f727857c19 Fixes loot crates and animal attacks 
Fixes loot crates and animal attacks
Fixes https://github.com/tgstation/-tg-station/issues/10412
 2016-01-17 19:32:42 +03:00
duncathan salt 24784b8283 Merge pull request #14666 from Razharas/SMESfix 
Makes SMES drain cells on deconstruction
 2016-01-17 10:07:16 -06:00
xxalpha 0189be9519 Fixed covering clothing not hiding gender on examine(). 2016-01-17 15:57:46 +00:00
AnturK e39d5bb7cb Fixes firing_pin not qdeling. 2016-01-17 16:06:36 +01:00
tkdrg 6fab2e82d8 Merge pull request #14662 from MrStonedOne/patch-127 
Fixes control click to unpull not working with turfs.
 2016-01-17 11:57:55 -03:00
AnturK b31c6f1e15 Adds friendly fire check for some ranged hostile mobs 2016-01-17 15:54:24 +01:00
AnturK 038a947c9c Fixes MMI custom emotes 2016-01-17 15:49:01 +01:00
Razharas a2ecfc0fc4 Merge pull request #14405 from Kole6738/patch-4 
Prevent flipping a coin if wired
 2016-01-17 15:46:08 +03:00
Razharas 28ac3268d1 Merge pull request #14660 from Menshin/flappyflaps 
Generalized CanAStarPass() to all /obj
 2016-01-17 15:33:39 +03:00
Razharas 4a9ef86808 Merge pull request #14653 from ChangelingRain/malfhack 
Fixes a bug where malf hacked apcs couldn't be fixed with an apc frame
 2016-01-17 15:30:25 +03:00
Razharas 885456db1d Merge pull request #14648 from Buggy123/patch-6 
Broken bottles are now the same size as unbroken bottles.
 2016-01-17 12:35:55 +03:00
Razharas f982fa5327 Merge pull request #14655 from MrStonedOne/patch-126 
HOLY FUCKING SHIT, WHAT THE FUCK IS THAT.
 2016-01-17 12:34:20 +03:00