coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
36,161 Commits 9 Branches 11 Tags
0432cd9bb4eb9aa73fa40a2fb048965536c4e857
Commit Graph

16712 Commits

Author SHA1 Message Date
oranges 0432cd9bb4 Merge pull request #18484 from coiax/random-space 
All of space is now randomised
 2016-06-23 09:12:48 +12:00
Cheridan a6fc773540 Merge pull request #18723 from coiax/pond-skipping 
Adds visible ripples indicating shuttle's transit
 2016-06-22 11:24:44 -05:00
Faltnor d950565a3f Make Staff of Honkmother slightly less OP (#18802) 
Just reducing the stun on it a smidgen so it doesn't stun like a rapid fire stun gun.
 2016-06-22 03:23:05 -05:00
Cheridan 7ab8f8772f Merge pull request #18794 from KorPhaeron/durkel 
Adds missing return to boss loot
 2016-06-21 23:13:49 -05:00
Cheridan dbf467136f Merge pull request #18830 from MMMiracles/a_skele-ton 
Fixes Invisible Skeletons
 2016-06-21 23:10:56 -05:00
oranges 4bc99d1b2e Merge pull request #18798 from Niknakflak/AngelAI 
Adds the Angel AI Core sprite to the game
 2016-06-22 15:50:37 +12:00
MMMiracles d3e183a4d4 do the skeleton 2016-06-21 22:55:11 -04:00
oranges b85862f070 Merge pull request #18785 from Incoming5643/patch-12 
Fixes Infinitely Generating Exotic Blood
 2016-06-22 12:32:23 +12:00
oranges ca7067eded Merge pull request #18741 from KorPhaeron/tacticalespionageaction 
Tactical Espionage Action
 2016-06-22 12:08:05 +12:00
oranges 6b1ba6adec Merge pull request #18767 from ChangelingRain/legiondoor 
Fixes legion door alert
 2016-06-22 09:51:06 +12:00
oranges 12b8b1a9b2 Merge pull request #18735 from coiax/emergency-drone 
Adds Drone Shells to Emergency cargo packs
 2016-06-22 09:04:13 +12:00
Joan Lung 44875e7fd4 Fixes holoparasites spamming messages while taking negative damage (#18774) 2016-06-21 10:57:07 -05:00
Cheridan 8003b631ac Merge pull request #18761 from ChangelingRain/alloygain 
Scarab proselytizers reap more alloy from metal and plasteel and can now reap alloy from rods directly
 2016-06-21 10:09:43 -05:00
Joan Lung 8c8c69c8ac Merge pull request #18714 from coiax/fridge-magnet 
Station rename logging, admin reject button
 2016-06-21 08:46:17 -04:00
Jack Edge 3e30473365 Applied MSO's proposed changes 2016-06-21 13:34:36 +01:00
oranges 269ccc3cf0 Merge pull request #18743 from ChangelingRain/fcrnxvagurgbathrbsgurtbqf 
Non-servant humans can't understand clockwork mobs
 2016-06-21 20:35:24 +12:00
oranges 3a7eab6e05 Merge pull request #18729 from coiax/remove-spawn-3 
Remove spawn III
 2016-06-21 20:11:08 +12:00
PKPenguin321 01d4d02b70 conflicts + undo loc changes 
attackself/dragging the board now deletes it and spawns a new board of the proper type again instead of setting locs
 2016-06-20 22:22:50 -07:00
NikNakFlak 1f1d87c2e3 Angel AI 2016-06-20 22:19:11 -07:00
Cheridan 0287abf2dc Borgs now get less confused over time! 2016-06-20 23:55:13 -05:00
KorPhaeron d35a31d4ac Blood Contract 2016-06-20 20:14:35 -05:00
Joan Lung 41eee01d09 \n 2016-06-20 20:15:29 -04:00
Cheridan 4dd56dfbb7 Merge pull request #18738 from pudl/ka-desc 
Improves the KA description
 2016-06-20 17:12:42 -05: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
Incoming5643 f8547b852d Fixes Infinitely Generating Slime Jelly 2016-06-20 17:01:06 -04: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
Xhuis 3e890997f9 Welding fuel hotfix (#18773) 2016-06-20 14:05:11 -05:00
Joan Lung e3c8345a51 Fixes legion door alert 2016-06-20 12:46:44 -04: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 971df0d8de info 2016-06-20 10:36:01 -04:00
Jack Edge 2a31ce80ab Debugging statement commented out 2016-06-20 13:57:39 +01:00
Jack Edge 004dfdc3fe Maybe fixed null z and lavaland entry 2016-06-20 13:42:59 +01:00
Jack Edge 5da579b7c4 Merge branch 'master' into random-space 
Conflicts:
	_maps/asteroidstation.dm
 2016-06-20 13:06:08 +01: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
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
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
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
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
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
oranges d6bdeb7124 Merge pull request #18455 from Incoming5643/no_bones_about_it 
Mutantrace specflag omnibus
 2016-06-20 08:15:34 +12:00
Joan Lung 321d7ce4be Non-servant humans can't understand clockwork mobs 2016-06-19 15:46:36 -04:00
KorPhaeron 74e451e7ce Sneaking Mission 2016-06-19 14:39:39 -05:00
Joan Lung 20860f2d6a Merge pull request #18646 from Cruix/languages_split 
Splits languages into languages_spoken and languages_understood.
 2016-06-19 15:23:38 -04:00
unknown f052ce679b Fixed compile error 2016-06-19 15:13:16 -04:00
unknown 4b396a52e7 Resolved conflicts 2016-06-19 15:07:36 -04:00