cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 20:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,223 Commits 61 Branches 14 Tags
017cd65250aa79b7ac7ffd4e1c1664e59628fa71
Commit Graph

27990 Commits

Author SHA1 Message Date
oranges
017cd65250 Merge pull request #18047 from kevinz000/embraceTheMemes 
Reactive Table Armor - If you can't beat the memes, embrace them
 2016-06-07 13:03:08 +12:00
PKPenguin321
d3ba2473cc makes plant analyzers fit in belts again (#18324) 2016-06-06 20:01:51 -05:00
oranges
9d6936a607 Merge pull request #18197 from pudl/tank 
adds high-capacity watertanks
 2016-06-07 13:01:16 +12:00
oranges
2aba5f48ef Merge pull request #18263 from pudl/big-daddy-thicc-dick 
Adds bar stools
 2016-06-07 12:59:34 +12:00
oranges
808c2795cb Merge pull request #18267 from Incoming5643/Vote_Early_Vote_Often 
in game votes now provoke an action button
 2016-06-07 12:58:26 +12:00
oranges
05b4e82e02 Merge pull request #18272 from xxalpha/nukemyshitup 
Syndicate toolbox now has syndicate screwdriver.
 2016-06-07 12:57:44 +12:00
oranges
98d9e3b619 Merge pull request #18249 from Incoming5643/D-D-D-Do_You_Have_It 
Meaty Ores will now drop guts in addition to meat
 2016-06-07 12:55:04 +12:00
oranges
04e882b365 Merge pull request #18259 from Iamgoofball/greytide 
Refactors the Prison Break event into the Grey Tide event
 2016-06-07 12:48:52 +12:00
TechnoAlchemist
9ef7ca5ee6 Unique spectral sword sprite. (#18322) 2016-06-06 18:26:17 -05:00
Joan Lung
318b7268f8 Merge pull request #18108 from coiax/narnar-rune-ticker 
Nar'sie rune can no longer be scribed off station or on shuttles
 2016-06-06 18:56:10 -04:00
oranges
0714a272f0 Merge pull request #18237 from coiax/fix-18236 
KA now use the timer subsystem
 2016-06-07 10:26:05 +12:00
oranges
ccbc302876 Merge pull request #18282 from coiax/removing-spawn 
Removes spawn() from some things
 2016-06-07 10:21:54 +12:00
Jack Edge
8a1da445e3 Rip message var 2016-06-06 23:20:42 +01:00
oranges
744b722a12 Merge pull request #18241 from phil235/BloodRefactor 
Blood refactor stuff
 2016-06-07 10:09:35 +12:00
Jack Edge
91332dcaae Code review 2016-06-06 23:07:29 +01:00
Jack Edge
f7c05b8bd9 Nar'sie rune anti-cheese and autoinvoke 
🆑 coiax
rscdel: The Nar'sie rune automatically disappears if somehow transported
to a non-station z-level.
rscadd: The Nar'sie rune automatically invokes itself when drawn, and
every tick subsequently, so the Cultists of the Geometer can focus on
the more important task of congragating.
/🆑

- Made can_invoke() not require a user argument (for that auto-invoke)
- Removed unused user argument from fail_invoke, made message display an
argument (for that auto-invoke)
 2016-06-06 23:07:04 +01:00
oranges
0a05b7c433 Merge pull request #18256 from KorPhaeron/cleanup 
Removes some unused code
 2016-06-07 10:03:27 +12:00
oranges
ae0b8299a1 Merge pull request #18254 from xxalpha/double_niggers 
Fixed smooth shuttle walls not smoothing properly on rotation.
 2016-06-07 10:02:59 +12:00
PKPenguin321
09bb9cbcb9 fixes up some toy sword checks (#18252) 
removes broken check.
Fixes https://github.com/tgstation/tgstation/issues/18248
adds a missing return to account for nodrop items.
 2016-06-07 10:02:34 +12:00
Leo
356f5947e2 Hand of God: Gods can't hear another god's divine telepathy (#18251) 
Gods now can't hear other gods
 2016-06-07 10:02:00 +12:00
oranges
24cf031cb1 Merge pull request #17968 from Bobylein/chem-bottles-rework 
Pill icons based on master reagent and transparent chem bottles
 2016-06-07 09:56:11 +12:00
Cheridan
cad969ce7b Merge pull request #18257 from KorPhaeron/snow 
redpills snow turfs
 2016-06-06 00:40:40 -05:00
Cheridan
35c8e92ad7 Merge pull request #18265 from KorPhaeron/sword_fix 
Sword Fix
 2016-06-06 00:39:09 -05:00
Incoming
6656f410d6 this should be an istypeless forloop 2016-06-05 21:35:35 -04:00
Jack Edge
318ca08ecb Code review 2016-06-05 23:48:34 +01:00
Kevin
e584256330 removed pill changes 2016-06-06 00:10:32 +02:00
KorPhaeron
8f03e896bc Missing equal sounds 2016-06-05 16:50:50 -05:00
Jack Edge
a01b48aa48 Removes spawn() from some things 
Yay, refactoring.
 2016-06-05 20:08:36 +01:00
Jack Edge
5fa854e252 Fixes a runtime when the AI uses binary chat 
Might fix some bugs? Bugs that I introduced, but phil mentioned a
runtime.
 2016-06-05 18:52:39 +01:00
phil235
94a5d5bfad Atom movable that are neither /mob nor /obj should not be picked by the closet insertion proc. (#18244) 2016-06-05 12:48:19 -05:00
phil235
40a371296a Adding lizard blood pack in medbay storage's freezer crate. 
Added a var/exotic_bloodtype to species, instead of hardcoding a lizard type.
Fixes proc for objects who should never be bloodied.
 2016-06-05 18:12:08 +02:00
oranges
69bd3575e3 Merge pull request #18228 from ChangelingRain/swordofRATVAR 
Additional Ratvar conversion effects and related changes
 2016-06-06 01:35:26 +12:00
oranges
ff611ff2ce Merge pull request #18202 from coiax/enables-lazy-cloning 
Clone pods now grab their ghost on maturity
 2016-06-06 01:33:55 +12:00
oranges
e1055df57f Merge pull request #18235 from coiax/when-it-happens-we-will-know 
[s] Makes winning a pulse rifle little more noticable
 2016-06-06 01:33:12 +12:00
oranges
227b404a5e Merge pull request #18144 from coiax/robustin-blew-my-mind 
Adds two Fun verbs for admins (and one boring one)
 2016-06-06 01:32:50 +12:00
oranges
1e4b2b512a Merge pull request #18234 from coiax/laughter-for-all 
Adds laughter demon to wizard's spellbook
 2016-06-06 01:29:13 +12:00
oranges
3e731b117b Merge pull request #18119 from Cruix/wanted_posters 
Adds wanted posters, printable from security record computers.
 2016-06-06 01:26:35 +12:00
oranges
c09046e3f1 Merge pull request #18201 from PKPenguin321/cmo-implanter 
Refines autoimplanter code, gives CMO single use autoimplanter for HUD augment
 2016-06-06 01:25:52 +12:00
oranges
2bc1504007 Merge pull request #18226 from MMMiracles/evenMORERUINS 
lava ruins
 2016-06-06 01:24:43 +12:00
oranges
050c42ff5e Merge pull request #18174 from coiax/holodeck-cold 
Adds two new holodeck levels
 2016-06-06 01:23:43 +12:00
oranges
0992b25903 Merge pull request #18189 from coiax/kill-all-laughter 
Try to protect the ones we hug
 2016-06-06 01:23:06 +12:00
oranges
cc99a4803c Merge pull request #18233 from kevinz000/gravitygunspleaseworkedition 
Remake: Gravity guns
 2016-06-06 01:19:08 +12:00
oranges
a435f7dc74 Merge pull request #18150 from PKPenguin321/salty 
gives salt shakers a suicide_act
 2016-06-06 01:18:23 +12:00
oranges
bcb338b0c7 Merge pull request #18156 from X-TheDark/mech_battery_tweaks 
Mechs rememeber removed cell's charge level and adjust inserted one's accordingly
 2016-06-06 01:17:57 +12:00
Nerd Lord
50f2c15945 follow links 2016-06-05 09:10:27 -04:00
Nerd Lord
e816738280 Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR 2016-06-05 09:03:22 -04:00
AnturK
8edc244dc7 Merge pull request #18220 from KorPhaeron/ruin_runtimes 
(Hopefully) Fixes some ruin runtimes
 2016-06-05 14:44:26 +02:00
AnturK
cd67c17a80 Merge pull request #18175 from Iamgoofball/patch-57 
fixes gibtonite runtime
 2016-06-05 14:43:30 +02:00
AnturK
edbddb0aad Merge pull request #18194 from KorPhaeron/fix2 
Fixes centcomm commander corpse outfit/Mob spawner edits.
 2016-06-05 14:39:52 +02:00
Joan Lung
9e20a0adf7 Merge pull request #18269 from coiax/fix-18268 
Fixes (F) links
 2016-06-05 08:17:40 -04:00