cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-03 21:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,404 Commits 60 Branches 14 Tags
ece3c04ca3d28d240a4d7207c8ab45a2c9c4e24d
Commit Graph

30300 Commits

Author SHA1 Message Date
Fikou
8deeceefb6 [READY] Adds rideable Goliaths (#49003) 
* adds rideable goliaths

* stamding on the emdge

* plems work

* this should be it

* FUCK YOU TRAVIS

* primal friendly

* ok athath buddy

* mmm grayons

* sprite gang

* placeholder sprite, works till someone makes a new one maybe haha

* lets do this

* An object tames a monstrous beast somehow. More news at 5.
 2020-02-07 17:00:07 +01:00
Arkatos1
cd2a685ee8 tgui-next: Mining Vendor (#48991) 
* Mining Vendor tgui-next

* Formatting

* Revert "Formatting"

This reverts commit 2eb35516b2f755d78341915a4b57b2b8548195eb.
 2020-02-07 16:59:10 +01:00
SteelSlayer
21fd1b25ee Adds the dunkable element (#49192) 
* Adds the dunkable component

* Makes this an element instead

* early return

* makes this a bespoke element

* istype check for container
 2020-02-07 10:30:06 -05:00
Krysonism
5cd49e81ed [READY]Da ice cream update 2: On a stick. Adds 5 new ice creams. (#48995) 
* blob

* nogga black recipe and fix.

* adds food types and fixes empty ice creams.
 2020-02-07 15:20:33 +01:00
cacogen
9436ed69a8 Makes abductor baton child of stun baton (#48766) 
* Makes abductor baton child of stun baton


- Clarify var names and reorder vars in baton defines
- Slightly simplify active baton wash code

* forget about ()
 2020-02-07 14:53:14 +01:00
ArcaneMusic
38a675b544 [READY]Adds a new minor reward to the BEPIS, Party Pods. (#48654) 
* Initial commit, adding to minor techs after

* Adjusts window size, adds as a minor reward.

* english good me do

* I swear, really officer, I'm not drunk, I just can't type

* Alright fine maybe I should sleep

* FINE we'll go with this. I legitimately don't even drink

* Alright this clearly isn't working yet.

* Fixes touch reagents, and gives lead acetate some real-life symptoms thanks EOB

* _Perfection_

* Nobody told me I was conflict with my own file!

* Allows for touch reactions in a slightly more sane way. Hopefully.

* alright holup

* Minor minor change to the UI so that the menu doesn't clip anymore, swapped for the other barber's aid.

* Hairgrowth works now

* Fixes merge conflicts?
 2020-02-07 14:52:29 +01:00
Jordan Brown
910489bbb2 Revert some admin button moves (#49216) 
- Moves "Start Now" and "Delay Pre-Game" back to Server tab
 2020-02-06 21:27:28 -05:00
Jordan Brown
134d4d74a9 Merge pull request #49184 from peoplearestrange/master 
Removes "Special Verbs" category & reorganises admin buttons categories
 2020-02-05 09:44:30 -05:00
wesoda25
8847c5eb4f Lung damage makes you cough (#49014) 
* Update lungs.dm

* Update tgstation.dme

* brain

* onprocess not onspawn oops

* Update tgstation.dme

* please

* Update lungs.dm

* hopefully less shitcode

* thx bro
 2020-02-04 16:07:59 -05:00
skoglol
a28b24f149 Completely removes cloning (#48668) 
* Removed from code

* Removes cloners from maps

* Some more references, now compiles.

* Reduces availability of replica pods

* DNA scanner and tech disk rebranding

* pubby door name, cargo pack description
 2020-02-04 16:04:06 -05:00
peoplearestrange
6070541c56 changes to category 
changes Administration to Admin
 2020-02-04 20:23:55 +00:00
peoplearestrange
c8bd6a175d changes to category 
changes Administration to Admin
 2020-02-04 20:23:30 +00:00
peoplearestrange
060d16d5eb Changes to category 
changes Administration to Admin
 2020-02-04 20:23:13 +00:00
peoplearestrange
a9cfc9290c changes to category 
changes Administration to Admin
 2020-02-04 20:22:44 +00:00
peoplearestrange
19f7bd4cd1 Changes to category 
changes Administration to Admin
 2020-02-04 20:22:08 +00:00
peoplearestrange
2d89d54d55 changes to category 
Changes Administration to Admin
 2020-02-04 20:21:42 +00:00
peoplearestrange
e0601aaa48 changes to category 
changes Administration to Admin
 2020-02-04 20:21:22 +00:00
peoplearestrange
1f70641f9d changes to category 
Changes Administration to Admin
 2020-02-04 20:20:56 +00:00
peoplearestrange
6f6ec8f4a8 changes to category 
changes Administration to Admin
 2020-02-04 20:20:30 +00:00
peoplearestrange
d98821a34a changes to category 
changes Administration to Admin
 2020-02-04 20:19:56 +00:00
peoplearestrange
26f7a16ef4 changes to category 
Changes Administration to Admin
 2020-02-04 20:19:32 +00:00
peoplearestrange
9b71221911 Changes to Category 
changes Administration to Admin
 2020-02-04 20:19:07 +00:00
peoplearestrange
d8be9f2b65 Changes to category 
changes Administration to Admin
 2020-02-04 20:17:31 +00:00
peoplearestrange
ea1857ec22 Changes to Category 
changes Administration to Admin
 2020-02-04 20:16:10 +00:00
skoglol
c44e913803 Some more cloning prep stuff (#49090) 
* defib texts improved, now gives a little guidance.

* Removes the superfluous braindeath

* Organ repair surgeries now repeatable

* Death info message

* Reverts repeatables, improves brain repeatable

* defib more forceful, better brain messages, better mannitol healing.

* OR

* Update code/modules/surgery/brain_surgery.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

Co-authored-by: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>
 2020-02-04 13:50:56 -05:00
Jordan Brown
febba4deb7 Merge pull request #49124 from kriskog/timeofdeath 
Defib tod cleanup
 2020-02-04 11:10:04 -05:00
Jordan Brown
ce9577663a Merge pull request #49173 from ninjanomnom/material-lazy-init 
Makes the global materials lookup lazily initialized
 2020-02-04 11:05:59 -05:00
peoplearestrange
1b5e7cbdb9 Changes category 
Set admin notice = Server
 2020-02-04 15:32:10 +00:00
peoplearestrange
e7de94132e Removed hide most verb 
Removed the remaining code for "hide most" verb as its now not needed after the reshuffle
 2020-02-04 15:25:44 +00:00
ShizCalev
bfb4218a87 Merge pull request #49176 from AnturK/runtimesareforever 
Few more runtime fixes.
 2020-02-04 04:08:53 -05:00
ShizCalev
768696e0dc Merge pull request #49004 from kriskog/say 
Skips nulls and deleted in say
 2020-02-04 03:55:54 -05:00
Fikou
8a38734fe9 xeno names keep consistent numbers through evolution (#49150) 
* makes xenos have consistent numbers through evolutions

* makes benos have consistent numbers through evolutions

* this may be better

* pls work

* this should work

* FUCK you

* fuck
 2020-02-04 07:30:47 +01:00
nightred
49e08c89c3 Polymorph and robos work better (#49144) 
* ai disconnect

* ok this one works
 2020-02-04 07:28:21 +01:00
thebleh
93c96e89d7 Shows defib icon on corpses with soul (#49138) 
* show defib icon on revivable corpses

* update medhud in observer Destroy()
 2020-02-04 07:26:10 +01:00
ShizCalev
5120db8194 Attacking the SM with an item that's stuck to you will now dust the user. (#49133) 2020-02-04 07:21:22 +01:00
ShizCalev
3055b70349 emitter cleanup and fixes (#49129) 2020-02-04 07:14:41 +01:00
tralezab
96b6e28151 bigger mobs have some special health bars (#49104) 
* cool beans

* more, more!

* smol fix
 2020-02-04 07:09:36 +01:00
itseasytosee
0837547ff9 Adds 3 new toys to the prize pool not removing all of science edition. (#49122) 
* creative

* God damn it Travis

* Trick blindfold looks like a blindfold at first glance
 2020-02-04 07:07:14 +01:00
Qustinnus
48de09b7a4 Edible component; be gone vile organ code (#48596) 
* component

* progress

* stuff

* Makes minor progress on edible component

* Finishes component and applies it to organs

* newline

* forgot to send signal

* domob addition

* wave that organ flag

* return adde

* fixes some minor issues

* fixes

* done

* done

* done

* added last one

* done

* done

* fix
 2020-02-04 01:05:55 -05:00
TheChosenEvilOne
151dc3f78d beer (#49123) 
Signed-off-by: TheChosenEvilOne <tceo-email@protonmail.com>
 2020-02-04 07:03:49 +01:00
Mickyan
e985a0a18f Blood dripping scales with bleeding rate (#49092) 
* bleed decal rate

* forgot this guy
 2020-02-04 07:00:24 +01:00
cacogen
bbdb22a346 Improves cyberimplant readout (#49087) 2020-02-04 06:58:11 +01:00
peoplearestrange
5c2166adae Update admin_verbs.dm 2020-02-04 05:44:44 +00:00
peoplearestrange
5930b888da Changed Category 
Select Equipment = Admin - Events
 2020-02-04 04:55:44 +00:00
peoplearestrange
5c18d0c8b6 Changes Category 
Administration
 2020-02-04 04:51:53 +00:00
peoplearestrange
91955efa8f Changes Category 
Config/Launch Supplypod = Admin - Events
 2020-02-04 04:40:32 +00:00
peoplearestrange
75304837f0 Changes Category 
Adminwho = Administration
 2020-02-04 04:36:01 +00:00
peoplearestrange
c9f82866ae Changes Category 
Set player OOC color = Server
Reset player OOC color = Server
Adminnotice = Administration
 2020-02-04 04:35:21 +00:00
peoplearestrange
cf899d60ca Changes Category 
OOC
 2020-02-04 04:27:46 +00:00
peoplearestrange
2583a986c6 Changes Category 
OOC
 2020-02-04 04:26:55 +00:00