cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-21 06:25:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,693 Commits 61 Branches 14 Tags
737cddee6863579fdb4ccf3e7e07c4a2f5b2cd94
Commit Graph

16087 Commits

Author SHA1 Message Date
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
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
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
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
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
Cheridan
e687795914 Merge pull request #17959 from blobbernaut/capsulefix 
Prevents bluespace capsules from breaking the escape shuttle
 2016-05-27 17:46:51 -05:00
Shadowlight213
ce01058e7c Fixes merge conflicts 2016-05-27 15:36:56 -07:00
TechnoAlchemist
d156b25b28 Fixes issue #17969. 2016-05-27 15:14:42 -07:00
Joan Lung
2cfb2d8eed Layers are now defines (#17949) 
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
 2016-05-27 22:16:21 +02:00
Joan Lung
b61d1fd81f Merge pull request #17941 from Cheridan/cleaning_vomit 
Ends Flyman Starvation
 2016-05-27 16:14:03 -04:00
Cheridan
ff91cdf074 Merge pull request #17955 from phil235/BookBinderWrench 
Book binder can be unanchored with wrench
 2016-05-27 14:23:21 -05:00
Cheridan
2e74d742ad Themself 2016-05-27 14:08:47 -05:00
Cheridan
e92a4bc744 no src 2016-05-27 14:03:22 -05:00
Cheridan
61c83be5d9 Merge pull request #17935 from KorPhaeron/thecure 
Cures zombies
 2016-05-26 20:13:55 -05:00
oranges
1c917de28c Merge pull request #17939 from Cheridan/ruinspam 
Loading Ruins... Ruins Loaded. Loading Ruins...
 2016-05-27 12:46:06 +12:00
Cheridan
fcfa5dff6d flag memes 2016-05-26 19:36:57 -05:00
PKPenguin321
238971e1a8 removes duplicate definition 
Fixes https://github.com/tgstation/tgstation/issues/17961
 2016-05-26 17:34:40 -07:00
GunHog
fc386b3b0c Megaphones fix 
Megaphones now use say() instead of a custom override.
say() verb for living mods now accept spans as a third argument.
 2016-05-26 17:54:46 -05:00
blobbernaut
c214909b7c actually this is cleaner 
removes some useless redefinitions
 2016-05-26 18:26:31 -04:00
Cheridan
d5a95e093b Merge pull request #17896 from phil235/PullvsGrab 
Merges Pull and Grab into a single functionality.
 2016-05-26 15:51:46 -05:00
phil235
c6d55955e7 let's not have the paper forever stuck in case of power outage. 2016-05-26 22:23:24 +02:00