cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-24 08:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,099 Commits 61 Branches 14 Tags
02f97406963247c758e8e8ec00aa47a6941c5bf0
Commit Graph

42575 Commits

Author SHA1 Message Date
PKPenguin321
02f9740696 Esword cig lighting messages fix (#37216) 
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
 2018-04-16 20:19:42 -04:00
MrDoomBringer
5851de5d2f fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
 2018-04-16 20:13:43 -04:00
kevinz000
58198d9b27 My adventures in getFlatIcon performance (#36890) 2018-04-17 01:59:22 +03:00
Jordan Brown
2477c597e7 Merge pull request #37229 from vuonojenmustaturska/centcommission 
Add team objective support to the centcom antag datum
 2018-04-16 17:17:28 -04:00
Dax Dupont
efd69243e4 Fixes granters breaking on interrupt in final stage. (#37235) 
* Fixes granters breaking when interrupted in the final phase.

* Missed one
 2018-04-16 10:35:15 -05:00
AnturK
e1d9283c09 Fixes some defines. (#37223) 2018-04-16 16:32:05 +03:00
Armhulen
96abcbdb0b Grammar (#37236) 2018-04-16 15:44:45 +03:00
Dax Dupont
47de11d966 Readds shortcut for the current round logs. (#37245) 
* Removes antag huds and show tickets verb

* Readds shortcut to get to the current round log files

* Make a seperate proc
 2018-04-16 15:44:20 +03:00
vuonojenmustaturska
26fff381b5 Merge pull request #37214 from AnturK/imighthavebraindamage 
Fixes adjusting brain damage.
 2018-04-16 15:39:00 +03:00
vuonojenmustaturska
59ed55a02f Merge pull request #37209 from ninjanomnom/admin-shuttles 
Makes admin loaded shuttles work again
 2018-04-16 15:38:42 +03:00
Grandmother of 50
d45a54348a Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" (#37141) 
* Update chameleonproj.dm

* Pseudo Lings need not apply

* Update chameleonproj.dm

* Update chameleonproj.dm
 2018-04-16 05:39:21 -04:00
vuonojenmustaturska
e9529e4cfd Gives mining bots back their mesons (#37196) 
* Gives mining bots back their mesons

* qdel
 2018-04-16 05:35:35 -04:00
AnturK
45dd6f54ce Holopad fixes (#37197) 
* Fixes hologram icons

* Fixes hologram transfer
 2018-04-16 05:25:44 -04:00
Tad Hardesty
325093c926 Delete some duplicate macro definitions (#37208) 2018-04-16 05:23:58 -04:00
pigeons
3b5219a58d Parenthesizes some macros (#37212) 
* parenthesizes some macros

* A couple more macro definition parenthesizing
 2018-04-16 02:47:23 -06:00
Tad Hardesty
4a8c989d74 Fix grammar in lightbulb shatter message (#37207) 2018-04-15 23:43:25 -04:00
Jordan Brown
b07f13d656 Merge pull request #37201 from kevinz000/patch-483 
Adds missing arguments to eye insert procs
 2018-04-15 23:24:50 -04:00
Jordan Brown
7262a3e5cb Merge pull request #37206 from AutomaticFrenzy/patch/pixel-z 
Correct some pixel_z issues
 2018-04-15 23:22:38 -04:00
vuonojenmustaturska
1c743d5459 Merge pull request #37233 from KorPhaeron/gps3 
Fixes BSA targetting offline GPS
 2018-04-16 00:00:58 +03:00
KorPhaeron
d76dfa76d8 Fixes BSA targetting offline GPS 2018-04-15 12:48:32 -05:00
AnturK
7403c1d133 Filters out duplicate trophies. 2018-04-15 12:42:07 -05:00
vuonojenmustaturska
95e916b9d0 blacklist his grace from being deep-fried 2018-04-15 12:40:13 -05:00
vuonojenmustaturska
41e3151427 Allows passive gates to be touched in unpowered areas 2018-04-15 12:39:36 -05:00
vuonojenmustaturska
6fe4274455 Stops ghosts from being able to start plasma fires 2018-04-15 12:39:10 -05:00
vuonojenmustaturska
d69d7699d7 fixes borgs being able to send the ferry 2018-04-15 12:38:49 -05:00
vuonojenmustaturska
e13da06595 unconscious check 2018-04-15 12:38:18 -05:00
vuonojenmustaturska
c0bad9fd32 Couple of cryo fixes 2018-04-15 12:38:18 -05:00
vuonojenmustaturska
afb870e33c Fixes bluespace cookie centcom exploit 2018-04-15 12:37:42 -05:00
vuonojenmustaturska
c28c53bb1b Proper team integration 2018-04-15 18:43:07 +03:00
AnturK
43d323afff Fixes adjusting brain damage. 2018-04-15 12:17:15 +02:00
John Ginnane
3888041efd Reorganised component controls (#37054) 
* Reorganised component controls

* Simplied menu further

Removed "rename" and "copy ref", renamed "remove" to just "-"

* Added similar changes to "built in" components and added "Rename"
 2018-04-15 11:30:53 +02:00
ninjanomnom
79217530aa Makes admin loaded shuttles work again 2018-04-15 02:56:07 -04:00
Tad Hardesty
6df32bc38b Correct some pixel_z issues 2018-04-14 20:21:37 -07:00
Jordan Brown
4b2de7a785 Merge pull request #37156 from ExcessiveUseOfCobblestone/patch-38 
Stops silicons looping through world every login looking for flippin runes
 2018-04-14 22:47:36 -04:00
John Ginnane
d434cac5b7 Sender of PDA messages is told when their message is sent (#37055) 
* Adds "sent message" to the sender of PDA messages

* Added span to message
 2018-04-14 17:13:52 -04:00
kevinz000
62a6825ad6 args 2018-04-14 13:50:00 -07:00
vuonojenmustaturska
3b27a1c35d zoinks 2018-04-14 10:57:26 -05:00
Tlaltecuhtli
2570384371 sucessfully fixes some grammar (#37095) 
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
 2018-04-14 16:12:36 +03:00
Jordie
8f9270ed68 removes startup message in sql log (#37176) 2018-04-14 16:11:36 +03:00
shrimpboom8
a175e016f9 Fixes imps all having the same name (#37168) 
* Update imp.dm

* Replaced 1 with TRUE
 2018-04-14 16:09:36 +03:00
AnturK
66d9a4a0cf Removes /related area variable. (#37173) 
* Removes /related area variable.

* area_contents begone

* doorstuff
 2018-04-14 12:45:00 +03:00
kevinz000
a06df10ab2 Changes ntnet address assignment from numerical ascending to 16 hexadecimal randomized seeded (in English, everything is now randomized instead of predictable) (#37167) 
* Emergency NTNet patch

* ok

* @naksu

* explicit null
 2018-04-14 12:42:41 +03:00
AnturK
ed3ecbbb54 Readds dropped #endif (#37174) 2018-04-13 23:10:56 -04:00
Nich
6756f1fc8f Makes the PI circuit use the PI define (#37161) 
* Makes the PI circuit use PI

* I'm a moron :()

* Update arithmetic.dm

* Update arithmetic.dm

* forgot the parentheses

* that's another commit
 2018-04-13 20:44:21 +03:00
Dax Dupont
3efe335958 Liver fixes (#37175) 
* Rebalances lethality and adds a traitcheck

* Moves borg reagent to other_reagents since these shouldn't do damage at all and are hardly toxins

* Lower it more because this is probably gonna hurt a lot real fast

* Naku's suggestion

derp

Thanks cobby

readds this check

almost nerfed cybernetic livers oops

Aaaaaa
 2018-04-13 20:39:47 +03:00
ShizCalev
0606fcf417 grunge airlock 2018-04-13 09:05:41 -05:00
Dax Dupont
f2846f6f0a Fixes SCP 194 not using the amount variable. 2018-04-13 09:04:25 -05:00
Jordan Brown
7379c23a7e Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:48 -05:00
Emmett Gaines
b831ab50aa Updates baseturf helpers to the new baseturf system (#37154) 2018-04-13 15:59:01 +03:00
Putnam3145
3264e5df5a Rounded the last digit of pi correctly (#37148) 
It's important, fellas. Makes pi 0.000007 wrong instead of 0.00009 wrong.
 2018-04-13 15:51:50 +03:00