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

25495 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
fa6c0dd393 chill 2018-06-11 14:42:06 +02:00
XDTM
9cde3a65c6 RESISTCOLD trait now properly prevents damage and slowdown 2018-06-11 14:38:26 +02: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
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
ShizCalev
3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04:00
MrStonedOne
0814e09bd5 Fix warning. 2018-06-09 11:24:34 -07:00
Jordan Brown
9a5859a977 Merge pull request #38358 from nfreader/record_crimes 
Logs minor and major crimes
 2018-06-09 13:21:36 -04:00
Jordan Brown
7accb5b093 Merge pull request #38361 from AnturK/yeahno 
Removes unused overview code.
 2018-06-09 13:20:06 -04:00
Tad Hardesty
ae5c744b54 Make chat squashing HTML-agnostic 2018-06-09 02:45:56 -07:00
Tad Hardesty
f3ae5a1a67 Fix legion cores not healing confusion 2018-06-09 01:55:59 -07:00
Tad Hardesty
8c515d8d99 Give plasmamen their plasma suits in VR 2018-06-09 01:17:14 -07:00
MrStonedOne
7f323c1dfe Fixes note interface flooding the string tree. 2018-06-08 23:42:57 -07:00
Tad Hardesty
86a0056057 Fix deaf people hearing borg modules going offline 2018-06-08 23:29:14 -07:00
ShizCalev
340f266ece Revert "Makes swimsuits underwear options" (#38371) 
This reverts commit 24685cd93c.
 2018-06-09 04:21:57 +03:00
ShizCalev
24685cd93c Makes swimsuits underwear options 2018-06-08 21:16:56 -04:00
Tad Hardesty
5f650ac7ac Replace area-wide fire overlay with reddening the lights 2018-06-08 14:17:16 -07:00
AnturK
aa04346864 Init time list on every mob! 2018-06-08 22:56:27 +02:00
Tlaltecuhtli
2bc1f5e31f fixes spiders not making webs (#38344) 
* fixes spiders not making webs

* r
 2018-06-08 14:17:03 -04:00
81Denton
115ff7f6f1 Runtimestation tweaks (#38340) 
* runtimestation tweaks, debug subtypes

* moves exposed wire to maint tunnel
 2018-06-08 10:51:00 -07:00
Jordan Brown
665e593e8e Merge pull request #38342 from ShizCalev/donk-fix 
Corrects Donk Co
 2018-06-08 13:03:51 -04:00
Nick Farley
29a32a7348 More key_names 2018-06-08 13:01:58 -04:00
Nick Farley
5fcbf9d628 [key_name(usr)] 2018-06-08 12:38:50 -04:00
Nick Farley
c644a56406 grab correct vars for HUDs 2018-06-08 11:55:59 -04:00
Nick Farley
7fee2a17bb Logs minor and major crimes 
Simply adds minor and major crimes to the records.html investigate log
 2018-06-08 11:32:14 -04:00