coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25,204 Commits 9 Branches 11 Tags
7ce5b8a42bfbb8a3abb9e6faeb27a63e3d0bddb9
Commit Graph

11355 Commits

Author SHA1 Message Date
Cheridan fd09e91f4c Merge pull request #12522 from optimumtact/readds_paralyse_sting 
Readds the parasting
 2015-10-21 19:06:19 -05:00
Cheridan 3128680825 Merge pull request #12547 from optimumtact/patch-3 
removes comments that do not contribute to code understanding
 2015-10-21 19:01:36 -05:00
phil235 fb7ad8b38f Merge pull request #12452 from Xhuis/radical 
Radiation tweaks and a geiger counter
 2015-10-22 01:13:00 +02:00
phil235 e85ae646a3 Merge pull request #12524 from kingofkosmos/newphotocopiericon 
New photocopier icon
 2015-10-22 00:51:10 +02:00
phil235 02bccf6cf8 Merge pull request #12536 from tgstation/RemieRichards-DroneHatFix 
Fixes drone hats
 2015-10-22 00:49:17 +02:00
phil235 afde447481 Merge pull request #12523 from MrStonedOne/patch-49 
Fixes spiders locking up the MC with do_after's
 2015-10-22 00:48:36 +02:00
phil235 21c4552576 Merge pull request #12487 from bgobandit/humanoids 
Changes the text human ==> humanoid where applicable.
 2015-10-22 00:41:19 +02:00
Jordie e6ef77aeff Merge pull request #12520 from optimumtact/patch-2 
Move autoadmin to a protected config datum
 2015-10-21 18:42:52 +11:00
oranges 7e12a51ebf YEAH THIS HAPPENING 
GET OUT
 2015-10-21 13:13:12 +13:00
Cheridan 03161ef93a Merge pull request #12421 from phil235/AsphyxiationFIx 
Fixes human not taking oxyloss damage when not breathing enough oxygen.
 2015-10-20 17:06:24 -05:00
Remie Richards 76dbbf42e7 Fixes drone hats 2015-10-20 16:30:50 +01:00
Jordie 8a35115f1d Merge pull request #12493 from Shadowlight213/Banhancements 
Adds alien jobbans and adds jobban and pref support to various events
 2015-10-20 15:21:40 +11:00
Shadowlight213 3303a926fa Removes commented out code 2015-10-19 21:15:35 -07:00
kingofkosmos c8333ac8ca Makes the photocopier look different from the librarian's scanner control interface. 2015-10-20 06:23:10 +03:00
Kyle Spier-Swenson ae9b3de7ad Fixes spiders locking up the MC with do_after's 2015-10-19 20:13:41 -07:00
oranges c0ebea1f23 Readds the parasting 
as a meme for retardation affected mobs
 2015-10-20 15:17:08 +13:00
oranges f570aa6410 Move autoadmin to a protected config datum 
This prevents any admin with permission to debug controller being able to edit this setting
 2015-10-20 14:42:21 +13:00
Razharas d1df0bfeff Merge pull request #12485 from xxalpha/ultrarange 
Added ultra_range() proc.
 2015-10-20 00:17:09 +03:00
Razharas 7d73392f67 Merge pull request #12509 from phil235/SecHudFix 
Fixes Sec Hud wanted status not being updated when changing identity.
 2015-10-19 23:16:04 +03:00
Razharas f8056d6d86 Merge pull request #12389 from KorPhaeron/MEDIOCRE 
Makeshift explosive lances
 2015-10-19 22:58:50 +03:00
Cheridan 56b7a7717b Merge pull request #12416 from KorPhaeron/drones 
Staff of Change now makes hacked drones
 2015-10-19 14:38:16 -05:00
Rui Neves Carvalho 80e7024f6c Fixes Sec Hud wanted status not being updated when changing identity. Original PR by Astralenigma, New one by phil235. 2015-10-19 21:22:05 +02:00
KorPhaeron 6d706ee6d2 Tablecrafting 2015-10-19 14:06:40 -05:00
xxalpha e82a216447 Changed various instances of range() and orange() to ultra_range(). 2015-10-19 20:04:14 +01:00
Razharas e989a0fbc4 Merge pull request #12290 from AnturK/freeadmin 
Autoadmin Config
 2015-10-19 21:50:01 +03:00
Razharas 16d508fe10 Merge pull request #12381 from KorPhaeron/nests 
Monster Nests
 2015-10-19 21:47:52 +03:00
Razharas 97554dd5ac Merge pull request #12443 from MrStonedOne/patch-48 
adds resize to the list of fun required vars
 2015-10-19 21:45:28 +03:00
Razharas 78416379dd Merge pull request #12484 from RemieRichards/Nyehhehheh 
Allows Species to set custom say spans.
 2015-10-19 21:45:03 +03:00
Razharas 33e6d35d03 Merge pull request #12378 from bgobandit/fuckeverything 
Chemists can turn gibs into soap, candles, and meat product: no fucking .int edition
 2015-10-19 19:54:42 +03:00
Cheridan 83be789e47 Merge pull request #12465 from RemieRichards/LoveMeAgain 
Overlays System Update [GIANT HATS!]
 2015-10-19 09:18:42 -05:00
Razharas 2ce1ec3a38 Merge pull request #12451 from xxalpha/swarmerfix 
Fix swarmer effect being affected by spacewind
 2015-10-19 14:53:47 +03:00
Razharas 2861493f26 Merge pull request #12477 from Jordie0608/nowevenunknownplayerscanbeoppressedtoo 
Allows adding notes and watchlist for unknown ckeys
 2015-10-19 13:26:16 +03:00
Razharas 59d88fd695 Merge pull request #12376 from Xhuis/attack_spooky 
Removes revenants calling attack_ghost() on things they click
 2015-10-19 10:09:47 +03:00
Razharas 123390d640 Merge pull request #12459 from phil235/BugFixBoogalooG 
Phil's batch of fixes
 2015-10-19 10:03:28 +03:00
Razharas 4bd2956c6b Merge pull request #12466 from phil235/BugFixBoogalooH 
Bugfixes: soulstone, reagent runtimes, etc
 2015-10-19 10:02:42 +03:00
Razharas 2b635f51ae Merge pull request #12469 from Shadowlight213/Dronemag 
Qol features for drones
 2015-10-19 10:01:20 +03:00
Jordie 3f0c55961f Merge pull request #12434 from freerealestate/master 
Fixes #12326: High-capacity power cells on Boxstation having wrong capacity
 2015-10-19 14:59:33 +11:00
Shadowlight213 9884a6624a Adds Shadowling bans 2015-10-18 16:20:58 -07:00
Shadowlight213 c6971d35e9 Removes misc spaces 2015-10-18 15:36:22 -07:00
Shadowlight213 35ca96331e Adds jobban support to syndicate borg 
Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
 2015-10-18 15:25:14 -07:00
Shadowlight213 00ceaafbe9 Cleans up changes lines to lower lines changed. 2015-10-18 13:20:04 -07:00
Shadowlight213 2ebbca4dd9 Reverts attempt to give drones alert window. 2015-10-18 13:14:09 -07:00
bgobandit 055427b65c human ==> humanoid where applicable 2015-10-18 13:50:34 -04:00
Remie Richards ec3be464f3 Allows Species to set custom say spans. 2015-10-18 17:17:27 +01:00
Remie Richards ed2a565fd0 Fixes some logic that could cause the server's cache of uniform+undershirt sprites to be regenerated and recached, all female clothing procs now assume _s has been tacked on already, instead of adding it themselves. 2015-10-18 16:14:52 +01:00
Remie Richards cb5458cfc3 Expands large-inhands to large-any-worn-item, Adds a system for overlays on top of inhands and other clothing (Think ammo counters, primed grenade flashing etc.), Removes almost all of the copypaste in the update_icons() system 2015-10-18 15:54:09 +01:00
Jordie0608 47dfb46f58 allows adding notes and watchlist for unknown ckeys 2015-10-18 20:48:13 +11:00
Jordie0608 2ad2cc83e7 Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen 
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
 2015-10-18 17:27:24 +11:00
Shadowlight213 fc13a7cf70 Various QOL changes for drones. 
Makes drones have permanent magboot effect.
Gives drones the check station alerts verb
Allows drones to set Airlock access on RCDs
 2015-10-17 19:16:00 -07:00
bgobandit 08fefe27b5 addresses phil's concerns 2015-10-17 20:46:40 -04:00