cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,554 Commits 61 Branches 14 Tags
d7eee00a0b22e1d968ccbcba9c53b4e9cbc42f28
Commit Graph

3960 Commits

Author SHA1 Message Date
Xhuis
50fd38c4ac Bandaid fix for plasmaman wizards (#18446) 2016-06-11 16:04:20 -05:00
Cheridan
d933226d16 Merge pull request #18435 from KorPhaeron/pope 
Fixes pope spam
 2016-06-11 14:04:15 -05:00
Joan Lung
88c96aa5e8 brief delay 2016-06-11 10:25:36 -04:00
Joan Lung
3018b4bec1 restore 2016-06-11 09:13:31 -04:00
Joan Lung
35e6f676c8 Merge branch 'master' of https://github.com/tgstation/tgstation into componentscarcity 
Conflicts:
	code/game/gamemodes/clock_cult/clock_structures.dm
	code/game/turfs/simulated/walls_misc.dm
 2016-06-11 09:06:06 -04:00
oranges
d286cf4dd6 Merge pull request #18428 from Core0verload/clocker_fix 
Fixes tinker's cache exploit
 2016-06-12 00:50:14 +12:00
Joan Lung
616dc140b4 Clockwork Proselytizer now uses a proc instead of a huge else if (#18419) 
Instead of a huge else if chain, it's a proc that returns either an associated list with the values the proselytizer will use for it or FALSE, if it can't be proselytized.

This makes it easier to mess with and also saves like 5 lines!
Bonus; harm intent no longer disables proselytizing because wow that's a pain in the butt, holy crap.
 2016-06-12 00:40:14 +12:00
Joan Lung
ff6b5028f9 Anima Fragments get a number after their name (#18463) 2016-06-10 22:42:37 -05:00
Joan Lung
077745a6a6 description 2016-06-10 12:15:38 -04:00
Joan Lung
82e5b7fb99 failed scripture refunds components 2016-06-10 12:11:11 -04:00
coiax
fd20fa8b10 Observers can see clockcult description on sigils (#18411) 
No longer be confused by the difference between a dull sigil, an ominous
sigil or a sulking sigil.
 2016-06-10 11:02:12 -05:00
Joan Lung
eaf0e464a3 use the right proc 2016-06-10 10:49:17 -04:00
Joan Lung
f73ae66659 testing 2016-06-10 10:37:09 -04:00
Joan Lung
4faa1124b6 Makes clockwork component generation slightly less crazy 2016-06-10 10:30:03 -04:00
KorPhaeron
bc37db117a Fixes pope spam 2016-06-10 08:52:45 -05:00
Joan Lung
352e6831f9 Clockwork structures are now slightly more resistant to lava (#18410) 
* Clockwork structures are now slightly more resistant to lava.

* flying mobs that are immune to lava what a shocker

* sanity

* ,
 2016-06-11 01:37:28 +12:00
c0
ea5162cdd1 Fixes tinker's cache exploit 2016-06-10 11:40:50 +03:00
oranges
a726c30a7f Merge pull request #18397 from coiax/fix-18352 
Refactors slime names; altered slime, xeno names kept when evolving
 2016-06-10 20:03:43 +12:00
oranges
d937e0679f Merge pull request #18418 from ChangelingRain/reallygayte 
Fixes the infinite shuttle when a clockwork gateway is Destroy()ed
 2016-06-10 14:49:00 +12:00
Joan Lung
831983e9ee Fixes the infinite shuttle when a clockwork gateway is Destroy()ed 2016-06-09 22:37:44 -04:00
Joan Lung
60e639ca73 Fixes a summon cultist runtime (#18390) 
Fixes a summon cultist runtime
 2016-06-10 13:16:16 +12:00
Remie Richards
a13c0bdd77 Fixes lings not getting notes from husking (#18405) 2016-06-09 18:52:09 -05:00
oranges
38baee52b5 Merge pull request #18379 from ChangelingRain/stationisagoodfriendtoconvert 
You can't summon the Ark of the Clockwork Justicar on a shuttle
 2016-06-10 09:51:37 +12:00
Razharas
4b7d83be77 Merge pull request #18375 from ChangelingRain/gearhud 
Makes cyborg ratvar conversion work properly
 2016-06-09 22:43:54 +03:00
Jack Edge
4f8981c6a5 Refactors slime names; altered slime, xeno names kept when evolving 
Also fixes #18352.

Slime colour and adulthood are specified in New(), which is a lot better
than having an ugly spawn(0) in the middle of a New(). Slimes also only
update their names when growing or shrinking when it matches their
existing name format.

So if you happen to be a slime called Carl Lagerfield, it won't change
your name if you grow up to adulthood.

In addition non-standard xeno names are preserved while evolving.
And it also applies your old dir to the new xeno, because that looks
slightly better.
 2016-06-09 15:57:24 +01:00
Joan Lung
790351b4a7 Revert "Theme" 
This reverts commit a6ffdeb223.
 2016-06-09 09:39:01 -04:00
Joan Lung
a6ffdeb223 Theme 2016-06-09 09:30:43 -04:00
oranges
a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know 
Renames and relores loyalty implants to mindshield implants.
 2016-06-09 15:39:53 +12:00
oranges
4af9392f01 Merge pull request #18333 from KorPhaeron/charter 
Captain's Charter/Captain can name the station
 2016-06-09 15:39:41 +12:00
Sawu
190947be34 Adds an overflow just in case. 2016-06-09 12:54:49 +10:00
Sawu
c718c8b9ac Sin Quickfixes 
* Bishops no longer teleport to ghosts.
* Bishops will now ignore mobs without Ckeys
* Bishops have an expanded list of sayings.
* Bishops are now neutral-hostile. They will go about their duty if left alone, but if attacked they will respond violently.
* Fixed a grammar error in one of the Bishop's lines.
* Removed a trailing comment.
 2016-06-09 12:37:31 +10:00
Joan Lung
dc44d745f4 too lethal too lethal pull back (#18370) 2016-06-08 18:13:46 -05:00
Joan Lung
f8d24f5141 You can't make the Ark on a shuttle 2016-06-08 17:48:04 -04:00
oranges
236bb21c00 Merge pull request #18349 from sawu-tg/snpcs 
Adds the Bishop of Sin
 2016-06-09 09:16:34 +12:00
Sawu
c03f9f8bb0 Changes some numbers to defines 2016-06-09 07:09:18 +10:00
Joan Lung
0b8503bba8 you can't update mob-related things in pre_setup() because they DO NOT HAVE A LIVING MOB AT THAT POINT 2016-06-08 16:01:53 -04:00
Joan Lung
0765173ee2 hudupdate 2016-06-08 15:59:12 -04:00
Joan Lung
4f8133c3d1 unfucks ratvar conversion 2016-06-08 15:50:06 -04:00
Jordie
689cee4867 Merge pull request #18327 from ChangelingRain/mianaai_fragment 
Buffs anima fragments
 2016-06-08 21:16:29 +10:00
oranges
c5a84c769d Merge pull request #18036 from AnturK/init_meme 
Defers some list initializations
 2016-06-08 19:20:04 +12:00
Sawu
99559af638 Small changes to Sins 
* Removes usage of traitors in Sins
* Adds two sin related weapons, with multiple functions depending on whether the sin was judged as good or bad.
 2016-06-08 17:05:15 +10:00
Joan Lung
21945f5509 ) 2016-06-07 23:09:53 -04:00
Joan Lung
704c89ae02 hellish style choices 2016-06-07 22:59:20 -04:00
Joan Lung
2acdf638a7 a one character fix 2016-06-07 22:49:08 -04:00
Joan Lung
4fe317c21e i'm glad i caught that it might have been bad 2016-06-07 22:10:40 -04:00
Cruix
5259e73f4d Fixes changelings readapting while in stasis removing the regenerate verb. (#18317) 2016-06-08 11:17:39 +12:00
Joan Lung
55ac3ccb0f all of the fixes 2016-06-07 17:54:42 -04:00
Joan Lung
698210da02 fixathon 2016-06-07 17:48:52 -04:00
Joan Lung
6e64c697d7 more fixes 2016-06-07 17:47:12 -04:00
oranges
032b5473f8 Merge pull request #18306 from lzimann/lowpopmeme 
Number of nuke ops now scale with population
 2016-06-08 09:09:53 +12:00