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

22662 Commits

Author SHA1 Message Date
Leo
bc6ef6619c Merge pull request #31284 from tgstation/Cyberboss-patch-1 
Code cleanup in snack_meats.dm
 2017-10-04 21:26:38 -03:00
Leo
85d717350d Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 21:25:31 -03:00
Leo
4ffb1cdd0e Merge pull request #31289 from ShizCalev/hacknslash 
Makes the energy katana swwwwwwish when drawn
 2017-10-04 21:24:44 -03:00
oranges
b8ea267866 Merge pull request #31281 from vuonojenmustaturska/clowncult 
Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
 2017-10-05 11:54:45 +13:00
ShizCalev
cddcbe3e4f Fixes shaking people up while buckled into a bed/resin nest (#31283) 
* Fixes shaking people up when buckled into bed

* CB
 2017-10-05 11:00:27 +13:00
oranges
a47dc83a1b Merge pull request #31275 from kingofkosmos/moredeconhints 
Adds deconstruction hints to various things
 2017-10-05 10:33:09 +13:00
kevinz000
94bb5beef5 Preliminary blast cannon cleanup (#31264) 
* Update blastcannon.dm

* Update blastcannon.dm

* Update blastcannon.dm
 2017-10-05 10:32:13 +13:00
ShizCalev
61854f7825 Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower (#31150) 
* Hides ninja socks, draining updated to DisplayPower

* CB

* KEEP_TOGETHER
 2017-10-05 10:29:19 +13:00
oranges
134bbd1223 Merge pull request #31238 from AnturK/specialeyes 
Space vision fix V2.0 - GAME_PLANE change
 2017-10-05 09:13:41 +13:00
kevinz000
12b845fcd4 Update projectile.dm (#31180) 2017-10-05 08:50:42 +13:00
kevinz000
aeadbceb27 why plus a minus value and not just minus the value... (#31279) 
* Update bullets.dm

* Update visuals_icons.dm

* Update asteroid.dm
 2017-10-04 14:02:44 -05:00
Jordan Brown
32050bed01 Moves laughter to the emote (#31276) 2017-10-04 13:19:18 -04:00
Jordan Brown
95f79435e7 Dummies used for preference setup always compile overlays (#31267) 2017-10-04 12:03:32 -04:00
Leo
85b9ba1497 Merge pull request #31256 from ShizCalev/zombie-toxin 
Zombies regen toxin damage
 2017-10-04 08:14:47 -03:00
vuonojenmustaturska
2ccaee1723 Makes gutlunches hungry for gibs again (#31241) 
* gutlunch fix

* combine ifs, removes unneeded check
 2017-10-04 11:11:24 +02:00
ShizCalev
c5b4213e28 Makes the energy katana swwwwwwish when drawn 2017-10-03 20:27:46 -04:00
oranges
4881c712fc Merge pull request #31237 from Cyberboss/STAPIUpdate 
Server tools API update to 3.1.0.1
 2017-10-04 12:47:28 +13:00
Armhulen
d75eb9cd1c Gives nightmares a random shadowling name (#31188) 
* fuck you ruined my !ONE COMMIT PR!

* !ONE COMMIT PR!
 2017-10-04 12:40:53 +13:00
KorPhaeron
085632fa63 Nightmare organs (#31034) 
* Heart of Darkness

* Forgot the desc

* I'm not good at typing

* Apparently hearts dont actually stop on death

* Sounds

* Special brain

* Fixes being ghosted when turned into a nightmare

* Define

* Typo

* Fixes shadow walk not clearing stuns

* Less hacky brain transfer
 2017-10-04 12:20:59 +13:00
Supermichael777
fc4a9799ef Fixes stealth nerf to detectives gun (#31125) 
* Fixes stealthnerf to detectives gun

Having knockdown healed stamina damage, but also needed stamina too keep you down. This rectifies the extra stamina healing

* WEW LADS
 2017-10-04 12:13:41 +13:00
KorPhaeron
72389743db ismachinery define 2017-10-03 18:13:21 -05:00
oranges
196f1ddc5e Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA 
Makes mobs on fire light up
 2017-10-04 12:12:49 +13:00
MoreRobustThanYou
056be96cc6 Blobs now take damage from particle accelerators (#31181) 
* Blobs now take damage from particle accelerators

* Update particle.dm
 2017-10-04 12:11:49 +13:00
KorPhaeron
380413fb8b Ports dash weapons to the dash datum (#31222) 
* Dash katanas

* Properly assign the action

* Speaking of copypaste

* Its own file
 2017-10-04 12:10:39 +13:00
vuonojenmustaturska
69b1c4d24d Greatly speeds up bees (#31250) 
* Bee perf

* requested changes
 2017-10-03 19:04:02 -04:00
Jordan Brown
b146f7551d Code cleanup in snack_meats.dm 2017-10-03 19:00:24 -04:00
ExcessiveUseOfCobblestone
e577610361 Monkey Cubes expanding will give the new monkey an attack log with their creator (#31236) 
* Update snacks_meat.dm

* no one wants to see that

* WE'RE JUST SENDING IT TO ONE PLACE COBBY

* boop

* cool leoz tricks

* Update snacks_meat.dm
 2017-10-03 17:55:21 -05:00
kevinz000
0c47ef3668 fixes healguardians not being able to heal people (#31228) 
* Update guardian.dm

* Update support.dm

* Update guardian.dm
 2017-10-03 17:48:08 -05:00
KorPhaeron
f675778032 Fixes humans having no examine feedback for soft crit (#31247) 
* Soft crit examine

* Concise
 2017-10-04 09:30:42 +13:00
vuonojenmustaturska
f85d057593 Flat out removes /datum/reagents/process(), a top-5 proc by call volume 2017-10-03 23:29:04 +03:00
AnturK
85cd9e60d9 Organ initialization cleanup 2017-10-03 14:17:44 -05:00
kingofkosmos
2e63bd3dbe Adds deconstruction hints for beds, chairs, closets, grilles, lattices, catwalks, tables, racks, floors, plating and the bookcase. Plus few span fixes. 2017-10-03 18:39:07 +03:00
Leo
3dbc1c10fd Merge pull request #31210 from MoreRobustThanYou/patch-7 
Silicons can no longer take brain damage
 2017-10-03 08:19:48 -03:00
MoreRobustThanYou
8482e30d34 Makes antimatter code less shit (#31219) 
* Antimatter shielding that can't find a control unit won't delete itself anymore

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* gthruhru

* thanks Antur
 2017-10-03 11:39:41 +02:00
kevinz000
f8c8d43974 Fixes/tweaks wormholes event and portals (#30846) 
* fix

* THERE WE GO

* Update portals.dm
 2017-10-03 11:37:16 +02:00
ShizCalev
78bcd3f2d5 Zombies regen toxin damage 2017-10-03 01:23:32 -04:00
oranges
d7664b5397 Merge pull request #31196 from kevinz000/patch-303 
Fixes check antagonists for blood brothers
 2017-10-03 09:51:34 +13:00
AnturK
2db4228b22 Fixes space vision with eye organs + verbs missing with nightvision 2017-10-02 18:54:36 +02:00
Cyberboss
01d0c3888b Server tools API update to 3.1.0.1 2017-10-02 10:58:44 -04:00
ShizCalev
f82adb7238 Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) 
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
 2017-10-02 09:48:42 +02:00
Jordan Brown
98225c692e Makes the reply link for ahelps use the global token (#31191) 2017-10-02 01:14:08 -05:00
KorPhaeron
cc309236d9 ismecha define (#31192) 2017-10-02 02:03:40 -04:00
oranges
0ac005aeb4 Merge pull request #31127 from Cyberboss/notify_command 
Chat command to notify admins when the round ends
 2017-10-02 15:12:13 +13:00
JJRcop
a6460ce350 played_url key_name() to ckey 2017-10-01 19:30:32 -05:00
JJRcop
e89454b2ed played_url includes ckey 2017-10-01 19:30:32 -05:00
oranges
183252c962 Revert "Prompt for observer confirmation now happens when you click it initially" 2017-10-01 15:50:18 -05:00
kevinz000
09b07dad64 Ashwalker tendrils now drop everything on victims before consuming (#31177) 
* Update ash_walker_den.dm

* Update ash_walker_den.dm
 2017-10-01 15:21:23 -05:00
oranges
7477a559d3 Merge pull request #31201 from AnturK/grownspam 
Fixes grown runtime spam
 2017-10-02 09:19:21 +13:00
oranges
fb2b4e772a Merge pull request #31114 from AnturK/spacevision 
Fixes space vision
 2017-10-02 09:15:24 +13:00
bawhoppen
3e4d747b77 Adds desc to things lacking them. (#31086) 
* Desc change

* Update girders.dm

* Update valve.dm

* Update machine_stacking.dm

* Update shuttle_engines.dm

* Update pipe_dispenser.dm

* Update lib_items.dm
 2017-10-02 09:07:10 +13:00