cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-09 07:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,701 Commits 63 Branches 14 Tags
70ff770f29d8d39e735c8a51e472f4c8e6bbb3e6
Commit Graph

41716 Commits

Author SHA1 Message Date
BordListian
70ff770f29 - Fixes ghost role spawner for comms agent still showing up even if it deletes 2018-02-18 17:38:23 +01:00
Tlaltecuhtli
d22f421a54 improves radio code by fixing english 
wow
 2018-02-18 09:58:38 -06:00
Leo
b453c6be6d Removes unnused random event 2018-02-18 09:06:15 -06:00
vuonojenmustaturska
9f99c0faaa borgmods 2018-02-18 09:04:11 -06:00
Tlaltecuhtli
9f7e379090 bad copypaste 2018-02-18 09:03:26 -06:00
Tlaltecuhtli
fbe268b2dc fixes being unable to burn catpeople 
🆑
fix: u can make flametrowers in the lathe to kill catpeople
🆑
 2018-02-18 09:03:26 -06:00
Tlaltecuhtli
4bee619465 fixes some stuff in flametrowers (#35762) 
* fixes some stuff in flametrowers

* updates admin.txt
 2018-02-18 15:33:51 +02:00
Ordonis
e9fe2468c5 Newliquors (#35581) 
* Adds a few new liqueurs and cocktails

How the fuck in THIS game of all games do we not have Triple Sec.
SERIOUSLY.

* Well there goes a one commit clean PR rip me

reeeeee

* Adds sounds, fixes colors

* Fixes recipies giving eggnog

Don't ask

* Adds space where space should be

* Travis stop stalling reeeeeee

* Fixes spelling mistakes

* Adds some health benefits to sec drinks.

Quadruple sec is mild, but easy to make; quintuple sec is STRONG but
more difficult.

* Fixes merge conflict annoyance

* FUCK

* Updates boozepwr of Quadruple/Quintuple sec

If someone ever adds sex on the beach as a cocktail, I fully expect them
to add in Sex-tuple Sec as well.

* Makes clowntears reagent explicit within food_reagents

Removed hacky solution, introduced better one
 2018-02-18 14:13:29 +02:00
vuonojenmustaturska
e1c2c044c6 Merge pull request #35751 from Xhuis/crewpointer 
Crew pinpointers now fit on medical belts
 2018-02-18 14:08:30 +02:00
vuonojenmustaturska
cc4c69d078 Merge pull request #35746 from MoreRobustThanYou/patch-60 
Actually fixes SCP 294 overlay problems
 2018-02-18 14:08:08 +02:00
kevinz000
49482f7aa5 [s] makes chemical mob spawning log (#35756) 
* Rudimentary logging

* Update recipes.dm
 2018-02-18 14:06:39 +02:00
coiax
393198b0e6 MMIs can now whisper without talking on the radio (#35738) 
* MMIs can now whisper without talking on the radio

Fixes #35638.

* Otherwise, call super
 2018-02-17 21:12:28 -05:00
YPOQ
9a9183d705 Fixes bicycle riding (#35739) 2018-02-17 21:11:59 -05:00
kevinz000
c3060022a7 [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344) 
* Cross Z support

* Fixes projectile cross-Z

* removes unnecessary code

* don't draw impacts if you're not impacting

* fix

* unneeded var

* No mapcheck()ing anymore, space does it for us 2.0
 2018-02-18 02:41:25 +02:00
Joan Lung
c5a20f97c8 Makes the watcher wing crusher trophy less effective 2018-02-17 17:33:35 -06:00
Jordan Brown
0e9951317d Merge pull request #35728 from coiax/select-equipment-on-ghosts 
Select Equipment works on observers
 2018-02-17 18:09:12 -05:00
Jordan Brown
77f1c61835 Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks 
Fixes some tool interactions
 2018-02-17 18:09:03 -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
yorii
d1440f71fa fixes poddoor examine message (#35732) 
examining a blast door do longer gives the regular door examination about the maintenance panel.
 2018-02-17 14:15:54 -05:00
BordListian
6acee2b922 - Makes lava not burn unconstructed heat-exhanging pipes (#35705) 2018-02-17 18:13:08 +02:00
Dax Dupont
4c767ce101 Fixes extremely thicc robots (#35722) 
* Fixes extremely fat robots

* grasp
 2018-02-17 18:12:08 +02:00
coiax
a3025b25de Removes abstract shotgun from Summon Guns list (#35736) 
* Fixes abstract shotgun from Summon Guns list

Fixes #34962.

Looking at the old summon gun list, the comment says this
typepath was supposed to be a Bulldog.

* Removes duplicate bulldog
 2018-02-17 18:05:19 +02:00
vuonojenmustaturska
dfdc0c7fbc Merge pull request #35725 from jakeramsay007/slimepeoplefixes 
Jellypeople (and all subtypes) now can actually speak Slime, as intended
 2018-02-17 18:04:24 +02:00
vuonojenmustaturska
ef7ab18130 Merge pull request #35720 from LetterN/patch-1 
Pulling claw grammar fix
 2018-02-17 18:03:37 +02:00
vuonojenmustaturska
56366ba3fe Merge pull request #35604 from ACCount12/construction_datum_refactor 
Refactors mech construction datums
 2018-02-17 17:59:54 +02:00
vuonojenmustaturska
a5703ef7db Merge pull request #35734 from ShizCalev/path-cleanup 
Cleans up unused /area paths
 2018-02-17 17:38:57 +02:00
vuonojenmustaturska
756d1aef83 Merge pull request #35735 from coiax/fire-proof-hands 
RESISTHOT species can put out fires with their hands
 2018-02-17 17:38:17 +02:00
yorii
cb1cd92c9e Adds Modafinil properly this time. (#34908) 
* Adds modafinil, a sleep suppressant

* Adds recipe for modafinil

Yes I'm afraid of git now

* Fixed modafinil sleepimmune ids and OD to 15u

During testing 10u was simply much too low

* Change OD sleeping proc to use ignore_sleepimmune

* Fixed stuff to modafinil
 2018-02-17 17:37:18 +02:00
TankNut
b8b508456d Swaps locate for direct assignment 2018-02-17 08:53:15 -06:00
TankNut
75b7290cac Adds disable_sensors to mob_spawn/human 2018-02-17 08:53:15 -06:00
Jordan Brown
4cea0f022d Merge pull request #35716 from AnturK/slipspace 
Fixes wet space.
 2018-02-17 01:47:19 -05:00
Jordan Brown
c2a691214d Merge pull request #35717 from AnturK/robolove 
Fixes AI dating
 2018-02-17 01:47:09 -05:00
BordListian
2f2f789968 Adds rainbow slime clusterbangs (#35707) 
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
 2018-02-17 01:46:32 -05:00
Xhuis
8977b00f02 Crew pinpointers now fit on medical belts 2018-02-17 00:49:49 -05:00
MoreRobustThanYou
228ce4f3e1 Actually fixes SCP 294 overlay problems 2018-02-16 20:01:05 -05:00
Jack Edge
f427f20359 RESISTHOT species can put out fires with their hands 
🆑 coiax
fix: Species with RESISTHOT (golems, skeletons) can extinguish burning
items as if they were wearing fireproof gloves.
/🆑

Fixes #35648
 2018-02-16 20:03:22 +00:00
ShizCalev
3ada42aac3 Cleans up unused /area paths 2018-02-16 15:00:10 -05:00
Leo
a2ccca5f96 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines. Killing with a crusher grants special medals. (#35673) 2018-02-16 13:17:51 -05:00
Jack Edge
2b8dd31cd6 Select Equipment works on observers 
- Admins can use the Select Equipment verb on observers. Doing so will
humanise them and then apply the equipment.
- Now when admins are putting on their Centcom Commander outfits, they
can skip the awkward naked stage.
 2018-02-16 17:24:53 +00:00
MetroidLover
c669c558ed Space Ninja smoke bomb refill (#35689) 
* Ninja Smoke Bomb refill

Adds Ninja smoke bomb refill ability.

* Change a spaghetti flaw.

* I fluffed the indentation again. :P
 2018-02-16 11:38:15 -05:00
AnturK
a5bcb83ea7 Some antag fixes. (#35690) 
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
 2018-02-16 11:34:38 -05:00
Jordan Brown
5d5527855d Merge pull request #35697 from praisenarsie/patch-34 
Fixes addiction text
 2018-02-16 11:33:04 -05:00
Jordan Brown
e2f94038da Merge pull request #35702 from DaedalusGame/scholar-of-the-first-sin-edition 
Removes secondary
 2018-02-16 11:31:52 -05:00
Chayse Ramsay
f3421de13c Jellypeople (and all subtypes) now can actually speak Slime, as intended 2018-02-16 15:57:01 +00:00
Dax Dupont
88b6269888 Fixes some tool interactions 2018-02-16 16:34:17 +01:00
Jordan Brown
95cbf9b7f2 Merge pull request #35696 from Xhuis/circuit_rpg_loot 
Fixes wizard RPG loot from making circuit analyzers useless
 2018-02-16 08:52:14 -05:00
Letter N
23058f65ac Update manipulation.dm 2018-02-16 20:06:41 +08:00
vuonojenmustaturska
7014b5e06a Merge pull request #35629 from ShizCalev/floor-tool_acts 
Converts floor tool interactions to tool_act, fixes flooring exploits
 2018-02-16 14:06:32 +02:00
ShizCalev
15f0d19ce7 Adds mapping helpers to handle cyclelink & locking airlocks, updates all relevant maps (#35674) 
* Adds airlock helpers

* Maps updated

* few more
 2018-02-16 14:05:26 +02:00
vuonojenmustaturska
9e3ee33079 Merge pull request #35703 from DaedalusGame/ok-sure-why-not 
Fixes powercell injecting attaching the wrong value to rigged
 2018-02-16 13:09:01 +02:00