cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-09 15:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,727 Commits 63 Branches 14 Tags
ddca68fd27ecf3f8d44e00412007d3de8aaf91c2
Commit Graph

16103 Commits

Author SHA1 Message Date
kevinz000
ddca68fd27 * 2016-05-29 18:47:21 -07:00
kevinz000
169526997c cooldownsandmemes 2016-05-29 18:47:03 -07:00
kevinz000
1de9702e72 embracedemmemes 2016-05-29 18:35:06 -07:00
oranges
89c27f7d04 Merge pull request #17980 from Iamgoofball/patch-48 
Fixes infinite CLF3 fire
 2016-05-30 11:02:22 +12:00
oranges
1ebc858091 Merge pull request #17962 from coiax/admin-logging 
Adds admin logging to megafauna movement, shuttle loading
 2016-05-30 11:00:14 +12:00
oranges
d31b57f5a5 Merge pull request #17983 from PKPenguin321/patch-5 
normal revives cure viruses again
 2016-05-30 10:58:32 +12:00
oranges
d3bcd231f8 Merge pull request #17998 from phil235/ShotgunSawoffFix 
Fixes sawn off shotguns not showing the right sprite.
 2016-05-30 10:55:42 +12:00
oranges
444748190a Merge pull request #17991 from coiax/fix-17990 
Ghost sword orbits on button click, added URL, POI
 2016-05-30 10:55:18 +12:00
coiax
20a055b90e Wisps can now be recalled with the lantern (#17999) 
🆑 coiax
fix: Fixes bug where the wisp was unable to be recalled to the lantern.
/🆑

The way that the code is structured suggests that wisp recall works in
two parts, stripping the person who's being orbited of their thermal
vision, and then putting the wisp back in. While I was there, I cleaned
up some variables.
 2016-05-30 10:54:38 +12:00
kevinz000
c88c964f26 Minor Tweaks for PK borgs + recharger (#17940) 
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
 2016-05-30 10:52:52 +12:00
Cheridan
737cddee68 Merge pull request #18018 from Xhuis/general_rabbits 
Clockwork Post-Merge Patch II
 2016-05-29 13:34:58 -05:00
Xhuis
d9a4277a8d A few urgent fixes 2016-05-29 14:08:29 -04:00
Joan Lung
ff4863b188 Merge pull request #18002 from phil235/CocoonAbuseFix 
Fixes exploit with cocooning a dragged mob.
 2016-05-29 13:19:27 -04:00
Iamgoofball
41a5c65434 Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985) 
READ THE TITLE
 2016-05-29 08:29:21 -05:00
bawhoppen
1615e67e39 fixel projectiles (#18032) 2016-05-29 14:18:16 +02:00
oranges
d89446b42e Merge pull request #18005 from swankcookie/book_length 
adds a 20 character limit to book titles
 2016-05-29 17:05:33 +12:00
Xhuis
76c033cfdc Several changes to clockcult 2016-05-29 00:50:02 -04:00
Joan Lung
2d8ec64b69 Merge pull request #17981 from pudl/pgoat 
Redpills chemical colors
 2016-05-28 23:09:09 -04:00
Razharas
ddfd8f6f35 Merge branch 'master' of https://github.com/tgstation/-tg-station 2016-05-29 05:54:57 +03:00
TechnoAlchemist
bda1eec2a1 New Absinthe Sprites (#17976) 
* Fixes issue #17969.

* Makes the absinthe bottle sprite less eye melting, gives absinthe a shotglass sprite.

* woops
 2016-05-28 16:52:53 -05:00
Joan Lung
e5618e40d0 Ensures Legional continuality (#17972) 
* Ensures Legional continuality

* Fixes a bug

* two legions and both of them want you dead
 2016-05-28 16:29:37 -05:00
Joan Lung
04f45cfe14 Merge pull request #17922 from Xhuis/momentous_face 
Clockwork Cult Patch I
 2016-05-28 15:58:16 -04:00
pudl
ee96a4f07e fix 2016-05-28 14:44:25 -05:00
Swankcookie
dae5010ed0 adds a 20 character limit to book titles 2016-05-28 13:45:03 -05:00
Kyle Spier-Swenson
8e61de1458 Fixes Gibtonite both defusing AND exploding in rare conditions. (#17970) 
(explosion() sleeps)
 2016-05-28 12:18:40 -05:00
phil235
af2bac81b7 Fixes exploit with cocooning a dragged mob. 2016-05-28 19:04:11 +02:00
coiax
d15e4dec13 Removes dragon's blood drop (#18001) 
[s]Removes dragon's blood drop
 2016-05-28 11:47:42 -05:00
Lularian
8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
Xhuis
8d45a990b3 Some more changes that I can't remember 2016-05-28 11:59:26 -04:00
phil235
111259dae4 Fixes sawn off shotguns not showing the right sprite. 
Moves some code around.
 2016-05-28 17:45:42 +02:00
Jack Edge
be3a3a8e6c Make all ghosts normal again on sword destruction 2016-05-28 16:33:25 +01:00
Jack Edge
3910a546e6 Adds admin logging to megafauna movement 
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑

Megafauna adminnotifies on portal TP

Standard shuttle names and logging

Also ignore .mdme files

Muh commit

Actually works and stuff
 2016-05-28 16:26:28 +01:00
Joan Lung
325d8aa807 Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free 
Head Megaphones + Megaphone changes
 2016-05-28 10:40:31 -04:00
phil235
1f0b53803e Can't break the pull while stunned or unconscious anymore. (#17992) 2016-05-28 08:36:42 -05:00
Jack Edge
a677973a56 Ghost sword orbits on button click, added URL, POI 
🆑 coiax
rscadd: Spectral sword is now a point of interest for ghosts.
fix: Clicking the spectral sword action now orbits the sword, instead of
just teleporting to its location.
/🆑

Changed the notify_jump alert to notify_action, added three different
notification actions (jump, attack, orbit), modified notify_ghosts and
its callers appropriately.

Spectral sword now just counts the number of orbiting ghosts in the
turf, irregardless of what they're orbiting. Generally this'll be the
summation of orbiters of the mob, and orbiters of the sword.
 2016-05-28 12:23:24 +01:00
oranges
9a30d223b3 Merge pull request #17952 from coiax/fix-17950 
Removes SHUTTLE_* defines being numeric
 2016-05-28 20:09:19 +12:00
oranges
61ff04f6b7 Merge pull request #17975 from TechnoAlchemisto/I_have_a_really_tenous_relationship_with_my_parents_after_I_accidentally_killed_my_younger_brother 
Fixes issue #17969.
 2016-05-28 20:02:54 +12:00
Cheridan
b6c956e294 Merge pull request #17059 from Shadowlight213/Archangel 
[Review Ready]Wing mutant body parts and Angel wings
 2016-05-28 01:16:16 -05:00
Cheridan
e6c89f3b3a Merge pull request #17977 from lzimann/revert-17901-bawhoppen_copyen 
Revert "Removes some obselete attackby() code [Removes attackby crafting]"
 2016-05-28 00:37:19 -05:00
Xhuis
19644c8e53 Does some stuff, I forget what 2016-05-28 00:42:08 -04:00
PKPenguin321
9ed750de59 normal revives cure viruses again 
Fixes https://github.com/tgstation/tgstation/issues/17931
 2016-05-27 21:30:21 -07:00
pudl
1d7448486f fix 2016-05-27 22:31:03 -05:00
Xhuis
de1eea773e Adds some missing arguments to stun overrides 2016-05-27 23:17:29 -04:00
pudl
78295c04e7 colors 2016-05-27 22:16:55 -05:00
Cheridan
b18bbf309c Merge pull request #17888 from RemieRichards/crafting-tgui 
Converts personal crafting to a TGUI interface.
 2016-05-27 20:55:01 -05:00
Cheridan
a43394278f Merge pull request #17963 from PKPenguin321/patch-5 
removes duplicate definition
 2016-05-27 20:51:33 -05:00
Iamgoofball
4365b8b513 Fixes infinite CLF3 fire 2016-05-27 18:12:26 -07:00
Leo
7304f31325 Revert "Removes some obselete attackby() code [Removes attackby crafting]" 2016-05-27 20:37:45 -03:00
Remie Richards
80b4c3ca7f Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui 
Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js
 2016-05-28 00:24:58 +01:00
Cheridan
edac9e2171 Merge pull request #17901 from MrPerson/bawhoppen_copyen 
Removes some obselete attackby() code [Removes attackby crafting]
 2016-05-27 18:02:42 -05:00