cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 20:42:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,775 Commits 60 Branches 14 Tags
e54ccddec842e8e28d6565ebdd82d90026fc0e93
Commit Graph

2971 Commits

Author SHA1 Message Date
Ashe Higgs
e54ccddec8 Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759) 
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
 2018-02-20 18:09:59 -05:00
Dax Dupont
221374e10b Reflectors now reset the range of a projectile like before! (#35726) 
* Reflectors now reset the range of a projectile.

* how about dem apples
 2018-02-17 14:17:11 -05:00
Jordan Brown
d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
oranges
82af086fd8 Merge pull request #35542 from ShizCalev/free-spam-removal 
Cleans up some duplicate canusetopic warnings
 2018-02-16 15:34:37 +13:00
ShizCalev
0195f03435 [s]Fixes writing bugs/exploits (#35552) 
* literacy crisis

* cleanup
 2018-02-16 11:09:16 +13:00
Jordan Brown
9e53045bd3 Merge pull request #35661 from MrStonedOne/patch-483 
Mekhi goes on the table
 2018-02-15 09:49:02 -05:00
Tad Hardesty
bbe4d12d13 Support stations with multiple z-levels (#35339) 
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
 2018-02-15 10:21:25 +01:00
Kyle Spier-Swenson
099b08fa97 Mekhi goes on the table 2018-02-14 00:32:29 -08:00
vuonojenmustaturska
960f42d292 Merge pull request #35531 from ACCount12/mining_tool 
Mining tools now use tool system
 2018-02-13 18:33:52 +02:00
Robustin
6a5c750fb5 Cult Update? Cult Update! (#35433) 
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
 2018-02-12 16:17:58 -05:00
ACCount12
f43fcbd1d6 Replaces istype checks for mining tools with tool_behavior checks 2018-02-13 00:09:50 +03:00
ACCount12
2169e8638c Makes mining tools use use_tool and have tool_behaviour 2018-02-13 00:09:50 +03:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521) 
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
 2018-02-12 17:16:47 +02:00
MoreRobustThanYou
aca0cd453a Urinal cakes can now be picked up again (#35566) 
* Urinal cakes can now be picked up again

* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
 2018-02-12 17:01:11 +02:00
Jordan Brown
47ed29cb5b Merge pull request #35514 from ShizCalev/ghost-role-syndi-access 
Fixes wrong ID for syndicate ghost roles
 2018-02-11 16:34:17 -05:00
MoreRobustThanYou
4268e48880 Makes urinal cakes more realistic (#35515) 
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
 2018-02-11 16:29:38 -05:00
ShizCalev
3cb6ab32d2 Cleans up some duplicate canusetopic warnings 2018-02-11 09:56:43 -05:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456) 
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
 2018-02-11 16:06:12 +13:00
uraniummeltdown
ac9964be70 Buildable Shuttle/Plastitanium Windows (#35376) 
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
 2018-02-10 18:49:43 -05:00
ShizCalev
9dfeb83ebd others 2018-02-10 15:24:58 -05:00
ShizCalev
dc862ad931 Var cleanup and map fixes 2018-02-07 17:10:22 -05:00
vuonojenmustaturska
dd9ae40cf7 Merge pull request #35360 from Robustin/blackmirror 
Removes synths and androids from magic mirror
 2018-02-07 12:41:12 +02:00
vuonojenmustaturska
a1c73db03c Merge pull request #35363 from Xhuis/chair_nerf 
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
 2018-02-07 12:38:32 +02:00
Jordan Brown
bd489f1aff Merge pull request #35349 from DaxDupont/ifuckinghatethese 
Moves the pocket protector to lockers instead of on the uniform.
 2018-02-06 11:45:19 -05:00
ACCount
100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095) 
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
 2018-02-06 11:02:53 +01:00
nicbn
9348ad9aad Fixes bloodpack sprite issues (#35288) 
* Fixes bloodpacks with question marks

* .

* .

* .
 2018-02-05 20:21:13 -05:00
Xhuis
48de810fbd Kills tactical brass chairs 2018-02-05 15:51:56 -05:00
Robustin
03237ad529 More mirror species blacklisted 2018-02-05 14:22:06 -05:00
Dax Dupont
d874e90906 Moves the pocket protector to lockers instead of on uniform 2018-02-05 17:29:27 +01:00
MMMiracles
6c2db52ab3 Snowdin 2.0 (#35000) 
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
 2018-02-05 17:09:34 +02:00
ShizCalev
ee18d6f8e2 Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#34907) 
* Cleanup

* .

* Synced special_role & factions with role defines

* Revert

* more cleanup

* fix
 2018-02-04 03:03:34 -06:00
Buggy123
b2c456df73 Morgues now beep if the mob is clonable. (#34622) 2018-02-04 02:57:57 -06:00
nicbn
dc09b1763e Adds tiny shards (#35070) 
* Adds tiny shards

* .

* .

* .

* .

* .

* .
 2018-02-04 02:40:01 -06:00
Jittai
df1a99ed8d [READY] Fixes de-initialization of cleanables-ash (#35191) 
* Fixes de-initialization of cleanables-ash

* boop

* :x

* better execution

* prevent pile-up

* special ash

* comment cleanup

* cleanup 2
 2018-02-04 02:12:22 -06:00
Slignerd
f5046f86ec Moves the spare ID inside the captain's locker (#35219) 
* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)
 2018-02-04 02:01:33 -06:00
ExcessiveUseOfCobblestone
791f364a62 Update morgue.dm (#35227) 2018-02-02 13:44:18 -05:00
Ashe Higgs
6164e25f3e Blacklists servant golems from the magic mirror (#35147) 2018-01-31 17:19:18 -05:00
GLACoding
615f30d260 Increases mineral amount needed for rough metal false walls (#35065) 2018-01-31 13:32:46 -02:00
Jittai
5309cb873b Redone Coffin Icons (Dikembe Mutombo Edition) (#35127) 
* Coffins

* cleanup

* moar grain
 2018-01-31 02:51:00 -05:00
Robustin
418a8c0112 Cult Update (#33810) 
* Cult overhaul
 2018-01-30 21:59:03 +02:00
Ashe Higgs
122fb29280 Adds wall-attached defibrillator mounts (#34545) 
* Adds defibrillator mounts

* Update medical.dm

* Cyberboss requests, take two

* Requests by AnturK
 2018-01-30 08:33:52 +01:00
uraniummeltdown
24bbda0cc4 coffins have a new sprite (#34995) 2018-01-29 12:07:10 -05:00
vuonojenmustaturska
24f1cb134a Merge pull request #35072 from ChuckTheSheep/Morgue-and-Crematorium-Directional-Sprites-+-fixes 
Morgue and Crematorium Directional Sprites + Number of related fixes (Retrying #35068)
 2018-01-29 18:23:29 +02:00
uraniummeltdown
1e2ec247f0 adds cosmic space bedsheet 2018-01-28 22:04:09 -06:00
ChuckTheJittai
254729a144 Retrying #35068 2018-01-28 15:02:03 -05:00
ShizCalev
25149f988c Deprecates landmark, spawns off bodies and trays 2018-01-26 12:59:00 -05:00
Jordan Brown
f98a4e66cd Merge pull request #34755 from ChuckTheSheep/Current-Color-as-Default-Color-in-Inputs 
All color inputs use current color as default choice
 2018-01-24 19:13:58 -05:00
XDTM
5a08a3aad0 Extends the disability refactor to include more traits, removing some snowflake code (#34664) 
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk

Notable changes:

    Fakedeath now updates instantly, instead of waiting for the next life tick.
    Fakedeath now sets time of death when acquired.
    Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
    Hulk no longer overrides status_flag changes, in case there are any.
 2018-01-25 09:12:44 +13:00
KorPhaeron
a1ec2c29eb Fixes the kitchen spike turning people upside down forever (#34807) 2018-01-24 17:02:19 -02:00
kevinz000
b974fc4fb4 Xeno nests are no longer held together by bolts. (#34766) 
* Update bed.dm

* Update alien_nest.dm
 2018-01-24 00:56:53 -05:00