coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
36,017 Commits 9 Branches 11 Tags
4dd56dfbb735ecf7e04f51650f101625f6330c2e
Commit Graph

36017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheridan 4dd56dfbb7 Merge pull request #18738 from pudl/ka-desc 
Improves the KA description
 2016-06-20 17:12:42 -05:00
oranges b9375f89f5 Merge pull request #18777 from pudl/oh-my-god 
Two more fixes
 2016-06-21 10:01:04 +12:00
oranges 46bbb4b615 Merge pull request #18728 from coiax/spawn-removal-2 
Removes spawn() from some more slime reactions
 2016-06-21 09:57:07 +12:00
oranges 6ddd748fb2 Merge pull request #18726 from coiax/spawn-removal-1 
Removes spawn() from things I
 2016-06-21 09:56:38 +12:00
tgstation-server b9d8d90d8b Automatic changelog generation for PR #18720 [ci skip] 2016-06-20 21:35:16 +00:00
oranges e2718408df Merge pull request #18720 from Supermichael777/Flaps-fix 
Makes beapsky able to use his room and all bots be able to use flaps
 2016-06-21 09:35:15 +12:00
Joan Lung f3043b3386 Cogscarabs have the proper dead icon (#18759) 
* Cogscarabs have the proper dead icon

* replace deconflict
 2016-06-20 15:55:36 -05:00
pudl 0298cc4f7b fine, im going to test from now on 2016-06-20 14:57:18 -05:00
Xhuis 3e890997f9 Welding fuel hotfix (#18773) 2016-06-20 14:05:11 -05:00
Joan Lung 74945ba314 Slightly important bugfix (#18747) 2016-06-20 12:39:18 -05:00
Cheridan 597472d4df Merge pull request #18768 from pudl/you-saw-nothing 
nothing important
 2016-06-20 12:21:40 -05:00
pudl 7878e4c5ec nothing important 2016-06-20 12:09:06 -05:00
Cheridan e4b73d3aae Merge pull request #18739 from ChangelingRain/camocost 
Nuke ops can no longer get free noslips with their camo kit
 2016-06-20 11:37:51 -05:00
Joan Lung 7f671620bf Merge pull request #18758 from pudl/i-dedicate-i-dedicate 
Cleaned up the big mess I made
 2016-06-20 11:26:19 -04:00
Joan Lung 6190940d96 Anima Fragments and Clockwork Marauders glow faintly (#18736) 
* Anima Fragments and Clockwork Marauders glow faintly

* I'm not fucking with that
 2016-06-20 17:10:08 +02:00
Supermichael777 f35a410ab6 Stupid github didnt show your coment the first time 2016-06-20 09:16:47 -04:00
pudl 71c0f487ab adds light 2016-06-20 08:07:09 -05:00
pudl 3406c5ec30 removal 2016-06-20 07:35:33 -05:00
pudl 8ab329341e yay 2016-06-20 07:32:58 -05:00
pudl f459865be7 Improvements 2016-06-20 05:51:40 -05:00
Kyle Spier-Swenson 0d6bbbb412 stop the pills (#18703) 
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
 2016-06-20 12:07:44 +02:00
oranges c480ad71ee Merge pull request #18732 from MrStonedOne/patch-218 
sstimer: Does a thing in a less retarded way.
 2016-06-20 18:48:05 +12:00
Xhuis c81d5fc354 Clockwork cult antagonist creation and job bans (#18730) 
* Clock cult creation and jobbans

* Admin creation objective description failsafe

* Failsafe, for real this time
 2016-06-20 08:27:57 +02:00
sybil-tgstation13 22278d94e9 Automatic changelog compile, [ci skip] 2016-06-20 01:34:17 +00:00
tgstation-server e18949d780 Automatic changelog generation for PR #18721 [ci skip] 2016-06-19 23:41:45 +00:00
oranges b43afb8209 Merge pull request #18721 from KorPhaeron/yellingatotherservers 
Allows basil and sybil captains to yell at eachother
 2016-06-20 11:41:43 +12:00
KorPhaeron 85cda49eba Multiline input 2016-06-19 18:32:42 -05:00
KorPhaeron c46f2624aa Station name instead of world.name 2016-06-19 18:25:55 -05:00
Joan Lung cf3339eb60 Merge pull request #18744 from MMMiracles/goliath 
Add a goliath emojii to ooc chat
 2016-06-19 19:21:02 -04:00
oranges bce99c4f58 Merge pull request #18668 from coiax/dropdel 
Adds DROPDEL flag; items will qdel() on dropped()
 2016-06-20 11:08:31 +12:00
tgstation-server e405c19f02 Automatic changelog generation for PR #18597 [ci skip] 2016-06-19 23:03:26 +00:00
oranges 9f2cfa39d3 Merge pull request #18597 from pudl/detective-office 
[MAP] Moves the detective to above the post office
 2016-06-20 11:03:24 +12:00
oranges 72371fcdc7 Merge pull request #18693 from Core0verload/list_overhead 
Reduces list init overhead a tiny bit
 2016-06-20 10:59:48 +12:00
oranges 23a792213a Merge pull request #18632 from Cheridan/hardcounter 
Changes flashes vs. borgs
 2016-06-20 10:57:34 +12:00
Supermichael777 f6dd9cc402 Actualy fixes the bug because OBTUSE PROC NAMES. 2016-06-19 18:53:44 -04:00
oranges 54634d780a Merge pull request #18713 from Xhuis/mfw_someones_already_doing_underwater_station 
Adds win/loss tracking to clockwork cult
 2016-06-20 10:49:20 +12:00
MMMiracles 3ab4492661 tiny goliaths 2016-06-19 17:15:12 -04:00
MMMiracles b197bac22d goliath 2016-06-19 16:40:29 -04:00
tgstation-server e359d1872e Automatic changelog generation for PR #18664 [ci skip] 2016-06-19 20:19:29 +00:00
oranges 68d9ee6a7f Merge pull request #18664 from coiax/birdboat-or-death 
Birdboat: atmos split and small tweaks
 2016-06-20 08:19:28 +12:00
oranges 87b00ba546 Merge pull request #18661 from pudl/I-have-been-to-the-market-here-and-back-I-know-theres-no-distance-in-the-space-time-continuum-gap 
Removes asstation
 2016-06-20 08:19:05 +12:00
oranges 9d2d092847 Merge pull request #18658 from coiax/fix-18389 
Bar tables now shuttle rotate properly
 2016-06-20 08:18:48 +12:00
oranges 448e386ac4 Merge pull request #18649 from Xhuis/my_eyes_have_seen_that_which_cannot_be_comprehended 
Reagent tank optimization
 2016-06-20 08:18:33 +12:00
oranges 7dc92e3f98 Merge pull request #18647 from TechnoAlchemisto/I_was_lucky_if_papa_went_for_me_first_because_then_at_least_I_would_be_too_disoriented_to_realize_what_he_was_doing_to_sis 
Adds hard cider to the bar.
 2016-06-20 08:18:05 +12:00
tgstation-server 57846b52d5 Automatic changelog generation for PR #18631 [ci skip] 2016-06-19 20:17:39 +00:00
oranges 679d9644d3 Merge pull request #18631 from KorPhaeron/ruins_cult 
Cult can only use runes on station and on mining
 2016-06-20 08:17:38 +12:00
oranges 42abed6467 Merge pull request #18635 from timkoster1/Devil-Hunger 
Gives devil saturation on receiving a soul
 2016-06-20 08:16:06 +12:00
tgstation-server 72e3b5a698 Automatic changelog generation for PR #18455 [ci skip] 2016-06-19 20:15:35 +00:00
oranges d6bdeb7124 Merge pull request #18455 from Incoming5643/no_bones_about_it 
Mutantrace specflag omnibus
 2016-06-20 08:15:34 +12:00
sybil-tgstation13 9fc8e3c016 Automatic changelog compile, [ci skip] 2016-06-19 20:08:41 +00:00