cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,774 Commits 61 Branches 14 Tags
e01ac07203a0dd33af1b706ba6ce6bc68be2438d
Commit Graph

24842 Commits

Author SHA1 Message Date
Jordan Brown
e01ac07203 Merge pull request #36721 from GrayRachnid/fix-crafting-tools 
Fix crafting tools tooltips
 2018-04-01 23:01:57 -04:00
Jordan Brown
9201c1c788 Merge pull request #36869 from RandomMarine/e 
Moves quick equip hotkey up to /mob
 2018-04-01 21:05:33 -04:00
Jordan Brown
2f537013ff Merge pull request #36865 from factoryman942/master 
adds a "the" to robo's supervisor in job description
 2018-04-01 12:17:12 -04:00
Jordan Brown
3990bb3645 Merge pull request #36856 from iskyp/resin+egg 
The y/n confirmation for laying eggs or resin over vents as a xeno is no longer reversed
 2018-04-01 12:11:38 -04:00
KorPhaeron
447146193a Refactors Dance Machine + deletes a bunch of sound files (#36815) 
* Refactors Dance Machine

* Removes sound from netherworld

* Fixes icons

* More fixes

* QDEL_LIST

* Sanity check

* Matches delimiter to README

* qdel_list

* Fixes disco version of machine
 2018-04-01 17:42:32 +03:00
YPOQ
8c3804d98f Fixes revenants being unable to siphon after failing a siphon 2018-04-01 08:33:22 -05:00
vuonojenmustaturska
803556b923 Merge pull request #36829 from MrStonedOne/onclick_rework 
[s]Minor Refactor of click code, anti-auto clicker protection
 2018-04-01 16:23:54 +03:00
vuonojenmustaturska
f6723670aa Merge pull request #36864 from robbym/master 
Cleaned up tile pointer circuit and converted to absolute coordinates
 2018-04-01 16:19:57 +03:00
vuonojenmustaturska
7176f6037c Merge pull request #36857 from iskyp/ayytableframes 
you can now walk through abductor table frames
 2018-04-01 15:33:25 +03:00
Davidj361
06e314800b [s] Fixed dragging shackled prison shoes off (#36630) 
* Fixed dragging shackled prison shoes off

* Should be returning FALSE, otherwise returns nil

* Did review change
 2018-04-01 15:29:59 +03:00
iksyp
514840b054 != "Yes" instead of == "No" 2018-04-01 00:55:49 -07:00
Jordan Brown
6fb849eeb3 Merge pull request #36840 from 81Denton/singulo-power 
Fixes singularity power output
 2018-04-01 01:18:48 -04:00
Jordan Brown
7b196a6ad5 Merge pull request #36824 from Robustin/mblood 
Monkeys can now die of bloodloss
 2018-04-01 01:17:28 -04:00
Jordan Brown
a7f92ae3d9 Merge pull request #36863 from AnturK/unconciousdefine 
Prefixes apply_effect flags, fixes unconcious define conflict
 2018-04-01 01:15:35 -04:00
Jordan Brown
6c6bca2b31 Merge pull request #36834 from KorPhaeron/darkness2 
Removes advanced darkness
 2018-04-01 01:08:54 -04:00
oranges
2727835216 Revert "[s] Disables non-essential admin verbs to prevent april fools from turning into "admins spam buttons"" 
This reverts commit 8f8dabdf49.
 2018-03-31 23:33:21 +00:00
oranges
f560613b0f Revert "Disables additional verbs that can be used to bypass the blocks." 
This reverts commit f11bbee15a.
 2018-03-31 23:31:54 +00:00
Iamgoofball
f11bbee15a Disables additional verbs that can be used to bypass the blocks. 2018-03-31 15:48:37 -07:00
Iamgoofball
8f8dabdf49 [s] Disables non-essential admin verbs to prevent april fools from turning into "admins spam buttons" 2018-03-31 15:35:28 -07:00
81Denton
77b1072d9b [Ready] Atmos cleanup + subtypes (#36690) 
* dv cleanup/pump fixes
dv cleanup pubby

* atmos machinery subtypes

* incinerator cleanup after on = FALSE; removes luminosity overrides

* fixes freezer target temp

fixes heater/freezer target temp

* flipped filters, flipped/inverse air mixers

* atmos filters and air mixers

* freezers and heaters

* semicolon

* solves conflicts with #36659, #36673

* fixes pubbystation.dmm merge conflict

* adds icon_state and comments to pumps/mixer/thermomachine

* min/max_temperature comment

* replaces 4500kPa with MAX_OUTPUT_PRESSURE

* handles freezer/on temp in Initialize()
 2018-03-31 16:33:21 -04:00
RandomMarine
f83dd8a7dd moves quick equip hotkey up to /mob 2018-03-31 13:17:20 -07:00
factoryman942
30794ccafb Update science.dm 2018-03-31 16:56:16 +01:00
Robby Madruga
fafb77e3cf Cleaned up tile pointer circuit and converted to absolute coordinates 2018-03-31 08:00:21 -07:00
AnturK
2a2fed3899 missed this one 2018-03-31 16:32:34 +02:00
AnturK
5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02:00
Jordan Brown
a577206f79 Removes empty New() 2018-03-31 09:12:05 -05:00
kevinz000
f39a5705be Buildmode GC (#36828) 2018-03-31 08:13:36 -04:00
kevinz000
e06f37a44d fixes a drinking glass smash runtime (#36826) 
* smash runtime

* qdeling
 2018-03-31 08:12:36 -04:00
iksyp
e1e335ac3e you can now walk through abductor table frames 
you can do it i believe in you
fixes #36299
 2018-03-31 04:03:36 -07:00
iksyp
303ccf364a laying resin over vents y/no confirmation is no longer reversed 
how do i explain this good
 2018-03-31 03:44:46 -07:00
Robustin
bb66ff77d2 Get_Flat_Human_Icon no longer draws asses that nobody wants (#36781) 
* Argument to limit excess icon work

* 50% less icon for your icon

* 75% less icon for your icon

* Correction

* statics the list, tweaks a default arg

* Cardinal argument list

* correct GLOB name
 2018-03-31 00:02:09 -04:00
MrStonedOne
455dfab442 Minor Refactor of click code. 2018-03-30 18:19:55 -07:00
Denton
825a47feba increases singulo rad multiplier 2018-03-30 22:15:55 +02:00
Cruix
251c54223d Added a new ability to sentient diseases (#36548) 
* Replaced body zone magic strings with defines

* Added the Secrete Infection ability to sentient diseases, and updated the infective component
 2018-03-30 21:09:19 +02:00
Davidj361
1e9993b130 Fixed table crafting with tools in surrounding area (#36786) 2018-03-30 21:08:24 +02:00
ShizCalev
485efbd338 Fixes mutant bodypart assignments (#36816) 
* Fixes mutant bodypart assignments

* comment
 2018-03-30 21:42:00 +03:00
KorPhaeron
22556308f7 Fixes staff of change borgs recieving AI laws (#36785) 
* Fixes staff of change borgs recieving AI laws

* lawupdate
 2018-03-30 21:40:27 +03:00
kevinz000
d60cc7afb0 runtime 2018-03-30 12:51:40 -05:00
Robustin
c67b0c181e bad zombie monkey 2018-03-30 11:58:48 -05:00
Jordan Brown
565a9dcc8c Merge pull request #36770 from ShizCalev/chem-dispenser-fix 
Fixes chem dispenser icon desync
 2018-03-30 12:26:13 -04:00
Jordan Brown
b58d6ce1cc Merge pull request #36780 from KorPhaeron/oocban 
Fixes OOC ban not applying to admins
 2018-03-30 12:19:05 -04:00
Jordan Brown
156327094a Merge pull request #36787 from Davidj361/36744-twistedHealthFix 
Removed health cost for Twisted Construction upon casting on a wrong object
 2018-03-30 12:14:52 -04:00
Jordan Brown
ca2a04bea3 Merge pull request #36795 from robbym/master 
Fixes custom ticker logic (#36792)
 2018-03-30 12:11:37 -04:00
kevinz000
08c4d9a0a6 Failing to latejoin as a job when the latejoin panel is already open now makes a more descriptive error message (#36794) 
* job availability

* avail

* Boop
 2018-03-30 12:04:48 -04:00
Jordan Brown
095b521231 Merge pull request #36803 from ShizCalev/chem-dispenser-exploit-fix 
[s] Fixes chem dispenser not actually requiring power
 2018-03-30 11:59:19 -04:00
Jordan Brown
db6bf0d8fe Merge pull request #36805 from ShizCalev/chemmaster-power-change-cleanup 
Cleans up duplicate chem_master power_change() proc
 2018-03-30 11:58:57 -04:00
Jordan Brown
221283f919 Merge pull request #36796 from neersighted/delete_perms 
Make the delete verb check for SPAWN|DEBUG
 2018-03-30 11:58:37 -04:00
ShizCalev
603db53fc2 Fixes silicons unable to remotely use chemmaster 2018-03-30 07:34:43 -05:00
KorPhaeron
dea0512059 Removes advanced darkness 2018-03-30 07:31:55 -05:00
KorPhaeron
1e052d6166 Being buckled to an object means space wind wont pull you (#36783) 
* Being buckled to an object means space wind wont pull you

* Puts check in the proper place
 2018-03-30 04:27:26 -04:00