cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-24 16:13:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,355 Commits 61 Branches 14 Tags
0ac63dbde7971dfde658462fcfb86ff4d43fc3fd
Commit Graph

43345 Commits

Author SHA1 Message Date
ninjanomnom
0ac63dbde7 Primary changes 2018-06-13 19:18:44 -04:00
AnturK
176cc32676 Fixes flash_color (#38430) 
* Fixes flash_color

* Good question, i can't find a good answer so let's simplify this.
 2018-06-13 09:54:45 -04:00
kevinz000
ace883a2d3 Cloning deletion fix (#38438) 2018-06-13 09:53:03 -04:00
Tad Hardesty
257e4b1642 Turf grammar omnibus (#38375) 
* Fix plurality and propriety on turfs

Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".

* Add an article var to handle unusual a/an

* An additional pass on turf names

* Decapitalize server, mainframe, killroom floors
 2018-06-13 05:42:29 -04:00
chesse20
d83bc2c874 Adds exotic and talking corgi crates (#38276) 
* add exotic corgis

* add talking corgi crate

* make talking corgi epic

* remove old codew
 2018-06-13 05:39:54 -04:00
CitrusGender
7713aa5058 Fixes null bullets from being fired after they're deleted (#38437) 
* Adds handle_atom_del check to if deleted bullets are equal to ammo type and chambered round.

* works for me

* Update _box_magazine.dm
 2018-06-13 05:38:15 -04:00
cacogen
5c7613c4ff You can see what other people eat or drink (#38395) 
* Makes drinking message visible to others

* Makes swallow message visible to other people

* Adds visible messages for eating

* Update snacks.dm

* Update snacks.dm

* Update objs.dm

* Update drinkingglass.dm

* Update pen.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinkingglass.dm

* Update drinks.dm

* Update condiment.dm

* Update snacks.dm

* Adds a few extra reagents to the borg shaker

* Update drinkingglass.dm

* Update drinkingglass.dm

* removes blood as a borg shaker reagent
 2018-06-13 05:34:54 -04:00
kevinz000
a3d1581083 BoH bombs now forcefully stun anyone flying when they go off (#38397) 
* Update bag_of_holding.dm

* Incorrect type.
 2018-06-13 05:32:48 -04:00
AnturK
d56b4556a5 Fixes votes trying to remove actions of people who already voted. (#38431) 2018-06-13 05:26:49 -04:00
AnturK
fd6851ef8d Fixes drunken scientist R&D point gain. (#38432) 
* Fixes drunken scientist point gain.

* Only R&D points

* Didn't mean to add this newline here.
 2018-06-13 05:26:34 -04:00
AnturK
80d828901b Fixes chem heater trying to heat up empty beakers. (#38434) 
* Fixes chem heater trying to heat up empty beakers.

* Typo
 2018-06-13 05:24:57 -04:00
AnturK
a384da6345 Fixes clothes getting damaged twice in explosions. (#38435) 2018-06-13 05:24:42 -04:00
Dax Dupont
4e3eff4f73 Equalizes thresholds on being fat (#38383) 2018-06-13 03:56:24 -04:00
Armhulen
82c2bffe9d Adds a new drink: Peppermint Patty from Archer! (#38427) 
* Sprites!

*  S_______ W________

* Candyland snuck into pr... Check!

* removal of candyland extract

* candyland but not the sprites yet.

* fixes :)

* Whoops, lets fix that too
 2018-06-13 03:49:44 -04:00
XDTM
af50573d85 Virus crates now contain randomly generated viruses instead of single-symptom advance presets (#38412) 
* Virus crates now contain randomly generated viruses instead of single-symptom advance presets

* fix

* mapswap
 2018-06-13 00:44:19 -07:00
Mickyan
eb9fa0d8f5 Add pacifism check for screwdriver/bottle attacks (#38416) 2018-06-13 00:22:26 -07:00
XDTM
a1037d1039 Androids are immune to radiation (#38420) 2018-06-13 00:17:27 -07:00
Jordan Brown
fda578cc22 Legacy config warning only happens if any legacy configs are present (#38421) 2018-06-12 19:19:00 -07:00
oranges
beb3c89cc6 Merge pull request #38429 from AnturK/runtimeA 
[s] Fixes sleeper logging.
 2018-06-13 10:49:58 +12:00
Jordan Brown
9089af581d Merge pull request #38414 from XDTM/cold_never_bothered_me_anyway 
RESISTCOLD trait now prevents damage and slowdown from cold, instead of preventing cold itself
 2018-06-12 18:16:53 -04:00
Jordan Brown
b8460c7b81 Merge pull request #38415 from XDTM/master_of_disguise 
[s]Diseases lose scan invisibility if their stealth drops below the threshold
 2018-06-12 11:50:41 -04:00
Jordan Brown
3dcf793cc7 Merge pull request #38422 from DaxDupont/hydroponics 
[s] Fixes exploit where botany trays can be refilled at no cost.
 2018-06-12 11:45:15 -04:00
Jordan Brown
55be4c1944 Merge pull request #38413 from Tlaltecuhtli/patch-45 
Add a missing space in mechacode
 2018-06-12 11:37:02 -04:00
AnturK
57dd33a04b Fixes sleeper logging. 2018-06-12 09:46:11 +02:00
kevinz000
e96b3b438c Fixes unintentional vehicle buff (#38404) 2018-06-11 22:57:20 -07:00
oranges
496c311f7f Merge pull request #38367 from AutomaticFrenzy/patch/pull-diagonally 
Fix pulling diagonally looking goofy
 2018-06-12 11:49:25 +12:00
oranges
75575f4ae8 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay 
Replace area-wide fire overlay with reddening the lights
 2018-06-12 11:48:47 +12:00
oranges
fb6a61b5cb Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-12 11:48:21 +12:00
oranges
9b3561e805 Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup 
Make chat squashing HTML-agnostic II
 2018-06-12 11:46:37 +12:00
oranges
124d9b081c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes 
Give plasmamen their plasma suits in VR
 2018-06-12 11:46:26 +12:00
oranges
5a079bae42 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods 
Fix deaf people hearing borg modules going offline
 2018-06-12 11:45:56 +12:00
oranges
009a303651 Merge pull request #38377 from AutomaticFrenzy/patch/splash-runtime 
Fix a runtime when clicking the splash screen fadeout
 2018-06-12 11:44:42 +12:00
oranges
de389ee586 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox 
[s] Fix lockboxes not actually being locked
 2018-06-12 11:44:24 +12:00
Jordan Brown
88cad42812 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion 
Fix legion cores not healing confusion
 2018-06-11 16:51:02 -04:00
AnturK
7f887bc4ea Removes doubled iaa definition. 2018-06-11 22:16:10 +02:00
Dax Dupont
4102790da6 [s] Fixes exploit where botany trays can be refilled at no cost. 2018-06-11 19:15:31 +02:00
AnturK
fd656d3623 Fixes nuke exploding instantly. (#38417) 2018-06-11 17:16:00 +03:00
XDTM
4dc129d8fa Diseases lose scan invisibility if their stealth drops below the threshold 2018-06-11 15:27:40 +02:00
XDTM
fa6c0dd393 chill 2018-06-11 14:42:06 +02:00
Tlaltecuhtli
cb3122d002 improves my gbp bank 2018-06-11 14:41:11 +02:00
XDTM
9cde3a65c6 RESISTCOLD trait now properly prevents damage and slowdown 2018-06-11 14:38:26 +02:00
XDTM
1ca5febe38 Anti-magic component start enabled (#38388) 2018-06-10 22:15:57 -07:00
ShizCalev
753752180c Makes swimsuits underwear (#38372) 2018-06-10 22:13:51 -07:00
fludd12
b2e9fe8728 Fixes and Upgrades Stabilized Gold Extracts (#38394) 
* Fixes and Upgrades

* I Forgot To Sync This Whoops

* If You Say So
 2018-06-10 22:03:55 -07:00
ShizCalev
0fdc645067 Adds logging for sleeper chem injections (#38396) 2018-06-10 22:03:30 -07:00
Jordan Brown
4d69d36b9a Merge pull request #38379 from MrStonedOne/fasternotes 
Fixes note/message interface flooding the string tree.
 2018-06-10 11:50:51 -04:00
AnturK
8c606af6cf Squashes traitors under one path (#38332) 2018-06-10 03:05:53 -07:00
kevinz000
c38e4c938d Make incendiary armor aspawn only (#38370) 2018-06-10 02:56:39 -07:00
AnturK
f7cf151e92 Fixes loading zlevels with static lighting. (#38365) 
* Fixes loading zlevels with static lighting.

* Actually this whole part is unnecessary now because change turf handles the change properly now.

* Correct
 2018-06-10 02:54:53 -07:00
kevinz000
bddba58241 Readds actual fun to admins throwing around drop pods (#38374) 
* Readds fun

* Fun
 2018-06-10 02:53:55 -07:00