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
34,882 Commits 61 Branches 14 Tags
ff7e8e433b5cead08089d90bcb946be78c68752e
Commit Graph

27728 Commits

Author SHA1 Message Date
Incoming
ff7e8e433b The true ruination of space: Death to the donut. 
All existing structures in space outside of mining/lavaland, the station, and centcom have been converted to ruins.

z10 has been added to maps with lavaland to make the number of crosslinked z levels up to a solid 9.

z10 is the "true deep space" level where nothing can ever spawn, this is mostly because it doesn't exist in some maps.
 2016-06-02 19:39:49 -04:00
KorPhaeron
5db8a76217 Revert "Updates some lavaland ruins and adds new ones." 2016-06-01 16:47:16 -05:00
oranges
ce5bd19adb Merge pull request #18107 from lordpidey/lavaland_changes 
Updates some lavaland ruins and adds new ones.
 2016-06-02 09:07:32 +12:00
oranges
c27a9a21bb Merge pull request #18070 from PKPenguin321/clothing-by-nienhaus 
Adds letterman jackets
 2016-06-02 09:01:29 +12:00
Cheridan
5e2348fd75 Merge pull request #18077 from KorPhaeron/beepsky_fix2 
Fixes beepsky cuffing people with no arms
 2016-06-01 12:49:40 -05:00
KorPhaeron
760803fe39 Changes return 0 to return FALSE 2016-06-01 12:23:50 -05:00
oranges
ddf2cc7542 Merge pull request #18087 from coiax/wash-behind-the-clones-ears 
Clone pod features, fixes, tweaks
 2016-06-01 23:53:32 +12:00
AnturK
c6e47f3e19 Merge pull request #18110 from optimumtact/boomwire 
Boom wires have rudimentary logging. (finishes bandit's work)
 2016-06-01 09:46:59 +02:00
oranges
6f866590b1 Merge pull request #18081 from KorPhaeron/create_antag 
Create Antagonist Fix
 2016-06-01 19:44:03 +12:00
oranges
2dd5f76f30 Merge pull request #18084 from hornygranny/edge_case_dont_real 
fixes singularity expanding and eating containment
 2016-06-01 19:42:50 +12:00
Cheridan
294eab14a0 Merge pull request #18088 from coiax/fix-18061 
Mobs only take damage once from a shuttle roadkill
 2016-06-01 02:05:05 -05:00
Cheridan
9b8c68e704 Merge pull request #18065 from coiax/blood-box 
Adds "blood freezer" to map; replaces freezer of blood packs
 2016-06-01 00:51:52 -05:00
oranges
b30e8742bf Merge pull request #18109 from xxalpha/ifixallthefloors 
Fixed two wrong types for plating
 2016-06-01 17:38:26 +12:00
TechnoAlchemist
6878e9fddb Adds luminosity to lasers and sparks. (#18090) 2016-05-31 21:18:09 -05:00
Joan Lung
7259a6370c Merge pull request #18086 from KorPhaeron/Igotpaid30dollarstodothis 
New Chaplain Weapons + Mass Driver buff
 2016-05-31 19:54:54 -04:00
Joan Lung
33c4955db4 Makes Ratvar finding you as a target more spooky (#18083) 2016-05-31 18:49:54 -05:00
Joan Lung
fa4ca9877c New clockwork wall/floor sprites (#18079) 
* New clockwork wall/floor sprites

* 360 conflict dodging

* improved sprites

* new sprites

* smoother despawn

* clang
 2016-05-31 18:49:34 -05:00
oranges
079973558f Fix the admin log message for syndicate bomb logging 2016-05-31 22:18:53 +00:00
oranges
7d3e3d0b85 Merge pull request #17832 from KorPhaeron/animes 
Just like one of my japanese animes
 2016-06-01 10:15:59 +12:00
oranges
5aa4d2710d Merge pull request #18022 from Xhuis/kaput_bird 
Fix bundle
 2016-06-01 10:15:13 +12:00
oranges
ebe8aa284a Merge pull request #18068 from RemieRichards/is_type_in_FUCK 
Typecaches and is_type_in_list() fixes
 2016-06-01 10:14:31 +12:00
KorPhaeron
d5dddf5bae Kills the sword ghost properly 2016-05-31 17:13:59 -05:00
oranges
83b3faf72f Merge pull request #17676 from Core0verload/they-are-taking-our-jobs 
Adds two new modes to cleanbots, allows playerbots to use emag functions
 2016-06-01 09:56:13 +12:00
oranges
687cd053e7 Merge pull request #18082 from hornygranny/abhorrent_level_of_power_creep 
aliens break cuffs instantly
 2016-06-01 09:46:21 +12:00
xxalpha
ad1c422a28 shoot me 2016-05-31 22:38:40 +01:00
hornygranny
0ae9ecb91c Update carbon.dm 
MUH DEFINES
 2016-05-31 14:17:24 -07:00
oranges
2544171982 Merge pull request #18058 from lordpidey/bottlefix 
Fixes condiment bottles losing name upon refilling.
 2016-06-01 09:17:05 +12:00
KorPhaeron
8d65a58e2c Fixes sword naming 2016-05-31 16:13:25 -05:00
Mike Long
f18fdbf73e Fixes wrathhand giving a ranged gib. 
Fixes spelling/punctuation on wrathhand.
Removes erroneous include.
 2016-05-31 15:43:51 -04:00
Cheridan
1e4585bd86 Merge pull request #17923 from Shadowlight213/dronelight 
Doubles drone light brightness
 2016-05-31 13:59:52 -05:00
hornygranny
8a65c7e6ec >it's a refactor everything while you're at it episode 2016-05-31 11:55:59 -07:00
KorPhaeron
9042c84087 The sword names itself now 2016-05-31 13:28:36 -05:00
KorPhaeron
d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis 
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
 2016-05-31 12:03:01 -05:00
Mike Long
48540c0558 Removes erroneous code. 2016-05-31 13:01:22 -04:00
Mike Long
cea21e4c57 Updates some lavaland ruins. 
Adds lavaland wrath ruin.
Adds lavaland wrath ruin's reward.
Lavaland ruins can now cause sintouching.
 2016-05-31 12:57:14 -04:00
oranges
d61fbb1d57 Merge pull request #18073 from Dahka/Fix_Ling_Suits 
Fixes the recursive qdel dropped loop from ling suits
 2016-05-31 20:59:20 +12:00
oranges
87f283e740 Merge pull request #18100 from Shadowlight213/Grilllll 
Fixes an issue with wings and shocked grills.
 2016-05-31 20:15:07 +12:00
oranges
79f1a49427 Merge pull request #18013 from xxalpha/ifixallthefloors 
Repathed all Box station floors that had var edited icon states. Also generic z levels
 2016-05-31 20:00:20 +12:00
Shadowlight213
614a2ab65b Fixes infinite slip 2016-05-31 00:54:50 -07:00
oranges
843f0484a7 Merge pull request #18056 from ChangelingRain/revenantnulled 
Fixes a bug
 2016-05-31 19:34:30 +12:00
lordpidey
4b586501b0 Toy cargo crate now contains proper stack of space carpet. (#18057) 2016-05-31 02:16:44 -05:00
coiax
372fe31908 Fixes bug where krokodil addiction wasn't horrific (#18075) 
Now it makes you a fullblown addict, like it should.
 2016-05-31 02:12:43 -05:00
oranges
f9da5c945a dds a proper canUseTopic check to gp (#18072) 
also merges range check with canUseTopic via be_close flag
 2016-05-31 02:10:36 -05:00
oranges
c7967cb1a7 Merge pull request #18095 from KorPhaeron/drake 
Hopefully stops drakes from bugging out
 2016-05-31 19:06:33 +12:00
KorPhaeron
ab7b0b6f58 Drake 2016-05-31 02:02:05 -05:00
KorPhaeron
26cbf2e3bb You've been down too long in the midnight sea 2016-05-30 23:35:03 -05:00
Xhuis
555147184e Removes the stuff I promised 2016-05-31 00:18:39 -04:00
oranges
b654016574 Merge pull request #17936 from MMMiracles/ruin_stuff 
Adds some spawnable shuttle templates for admin memery
 2016-05-31 15:58:12 +12:00
oranges
953fe2852b Merge pull request #18039 from coiax/alt-click-spraycan 
Adds alt-click to spraycans
 2016-05-31 15:55:22 +12:00
Jack Edge
6d11919185 Clone pod fixes, changes, tweaks 
🆑 coiax
rscadd: Clone pods now notify the medical channel on a successful clone.
They also notify the medical channel if the clone dies or is horribly
mutilated; but not if it is ejected early by authorised medical
personnel.
rscadd: Cloning pods now are more capable of cloning humanoid species
that do not breathe.
/🆑

- Cleaned up cloning.dm, removed a bunch of unused code, use TRUE and
FALSES, removed trailing returns, put some more colourful messages in.
- Small amounts of Bicardine are added to the clone to cope with any
NOBREATH crit damage.
- The `grab_ghost_when` var has been added, which will change when we
actually grab the ghost and stick it in the new body. By default it is
unchanged to when the clone is freshly made, but can be changed to
"mature" which is when the clone is ejected.
 2016-05-31 04:42:43 +01:00