cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,180 Commits 61 Branches 14 Tags
e6efbdf88f4a59fc260ca3dfd52eee41d284f609
Commit Graph

15763 Commits

Author SHA1 Message Date
Joan Lung
e6efbdf88f Cogscarab storage is no longer painted cardboard (#18821) 2016-06-22 18:48:36 -05:00
Joan Lung
ab0e354775 Clockwork treads are no longer NOSLIP (#18828) 2016-06-22 18:47:01 -05:00
Joan Lung
b97f9f154b Ratvar's Flame is no longer a good melee weapon (#18829) 2016-06-22 18:46:45 -05:00
Joan Lung
1e78916458 Invoking Sevtug is somewhat less obscenely powerful (#18831) 2016-06-22 18:46:05 -05:00
oranges
8b29e3e049 Merge pull request #18677 from coiax/cellular-emporium 
Changling evolution menu becomes cellular emporium
 2016-06-23 10:06:51 +12:00
Incoming5643
b622d10ecb Fixes three problems of my own identification/invention (#18824) 
* Fixes three problems of my own identification/invention
1. Fixes meaty ores spawning with invisible "snack" meats
2. Fixes easyattachment limbs remaining in your hand sometimes
3. Mirrors the fix of all ghost role sleepers being exclusively male from my other, less mergable pr.

* I failed a spot check
 2016-06-22 17:03:09 -05:00
oranges
0432cd9bb4 Merge pull request #18484 from coiax/random-space 
All of space is now randomised
 2016-06-23 09:12:48 +12:00
Joan Lung
8c87be8735 Spatial Gateways will last twice as long (#18808) 
* Spatial Gateways will last slightly longer

* no slabs
 2016-06-22 16:12:10 -05:00
Joan Lung
619543d9c2 Smacks clockwork component generation in the face again (#18804) 2016-06-22 16:02:46 -05:00
Sawu
cfd478eb79 Pope Fix Pt.1 2016-06-23 01:05:18 +10:00
Sawu
9463880ed8 Renames the initTemplateZLevel function to initTemplateBounds 2016-06-22 22:56:07 +10:00
Sawu
1bfca19bf9 Update/fix 
* Chapel is now loaded upon a pope spawning, as it's own Z-level
* ZLevel init for template loading separated into it's own function.
* Including missing sprites for the Hades Acolyte.
 2016-06-22 22:37:38 +10:00
Sawu
796b502ff0 Merge branch 'master' of https://github.com/tgstation/tgstation 
Conflicts:
	_maps/map_files/generic/z2.dmm
	icons/mob/animal.dmi
 2016-06-22 15:05:00 +10:00
Joan Lung
5f57279f53 Taunting Tirade no longer stuns (#18795) 2016-06-21 20:42:46 -05:00
oranges
0c45602585 Merge pull request #18731 from Xhuis/chaplain_vs_ratvar_buff 
Makes holy weapons protect against Ratvar's magic
 2016-06-22 12:41:03 +12:00
oranges
ca7067eded Merge pull request #18741 from KorPhaeron/tacticalespionageaction 
Tactical Espionage Action
 2016-06-22 12:08:05 +12:00
Xhuis
d410d57d05 Disables umbras (#18819) 2016-06-21 17:54:21 -05:00
oranges
ccadd14147 Merge pull request #18765 from ChangelingRain/nukemaster 
Nuclear bombs now only explode the station as long as they're in a non-space area on the station zlevel
 2016-06-22 09:51:34 +12:00
Jack Edge
120810316e Merge branch 'master' into cellular-emporium 2016-06-21 22:32:01 +01:00
Xhuis
e5b323b99b Bandaid fix for null rod checking 2016-06-21 17:29:12 -04:00
oranges
3250d74eb5 Revert "Removes umbras" 2016-06-22 09:06:05 +12:00
oranges
1732b8091f Merge pull request #18755 from Xhuis/people_on_this_server_make_me_so_damn_frustrated_sometimes 
Removes umbras
 2016-06-22 08:58:14 +12:00
Xhuis
8f11d98e98 Prevents ocular wardens from targeting null rod holders 2016-06-21 14:24:29 -04:00
Xhuis
ff7d7fd89d Holy items won't protect against the gods 2016-06-21 14:23:38 -04: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
Cheridan
e1f4feef2c Merge pull request #18760 from ChangelingRain/ratvarsbodyshop 
You can now repair clockwork structures with a clockwork proselytizer
 2016-06-21 10:08: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
Sawu
1b56de3d8e Pope of Sin Update 
* Acolytes of Hades have received their own unique sprite.
* Fixed an error that would cause Hades to be permanently stuck in Wrath Phase
* Acolytes summoned by Hades are now unable to move more than 6 tiles from him, to prevent leading.
* Hades' Ultimate Wrath has been given an extra effect to indicate it's happening.
* Sins are now global procs.
* Upon death, Hades' corpse will now transform into a portal to the Chapel of Sin, a small away-mission with a puzzle. Completing the puzzle will reward players with an Imbued version of Hades' Staff, giving them access to his power of Judgement.
 2016-06-21 20:05:23 +10: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
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
74945ba314 Slightly important bugfix (#18747) 2016-06-20 12:39:18 -05:00
Joan Lung
d5ce2a7dfb spacenukes 2016-06-20 12:49:45 -04:00
Joan Lung
8232e9cf93 Nuclear bombs now explode the station as long as they're on the station zlevel 2016-06-20 12:34:42 -04: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
Joan Lung
901b9b2549 Scarab proselytizers reap more alloy from metal and plasteel and can now reap alloy from rods directly 2016-06-20 10:32:17 -04:00
Joan Lung
968a2a7069 You can now repair clockwork structures with a clockwork proselytizer 2016-06-20 10:27:42 -04:00
Supermichael777
f35a410ab6 Stupid github didnt show your coment the first time 2016-06-20 09:16:47 -04:00
pudl
3406c5ec30 removal 2016-06-20 07:35:33 -05:00
pudl
8ab329341e yay 2016-06-20 07:32:58 -05:00
Jack Edge
5da579b7c4 Merge branch 'master' into random-space 
Conflicts:
	_maps/asteroidstation.dm
 2016-06-20 13:06:08 +01: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
Xhuis
a717ab41c6 Removes umbras 2016-06-20 02:10:56 -04: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