cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 13:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,886 Commits 61 Branches 14 Tags
4b7cc9047864e67de342aba2b252d805cc40fb49
Commit Graph

10796 Commits

Author SHA1 Message Date
Aranclanos
4b7cc90478 Fixes goliath tentacles not deleting themselves on a really particular situation, killing the mob with the tentacle hit. The mob must also delete itself on death. 2015-09-12 00:40:42 -03:00
Razharas
426a242f68 Merge pull request #11627 from Jordie0608/thebiblewastheoriginalredtape 
Resolves #5748, see jobban reasons from char setup
 2015-09-11 14:16:54 +03:00
Razharas
45fb337732 Merge pull request #11487 from bgobandit/matsblastusa 
Adds materials to some items for recycling purposes.
 2015-09-11 14:03:18 +03:00
phil235
e74ca82a47 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReagentReactionRuntimeFix 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
	icons/obj/assemblies/new_assemblies.dmi
 2015-09-10 21:49:39 +02:00
Razharas
17e5d0eea5 Merge pull request #11525 from xxalpha/dryshoes 
Absorbent galoshes.
 2015-09-10 22:01:03 +03:00
Aranclanos
f587588eb9 Merge pull request #11636 from duncathan/lol 
distro fix + fixes runtimes
 2015-09-09 20:37:51 -03:00
bgobandit
b3b9941432 Merge branch 'master' of https://github.com/tgstation/-tg-station into matsblastusa 
Conflicts:
	code/modules/assembly/flash.dm
 2015-09-09 14:04:41 -04:00
Aranclanos
fbbdbe17ed Merge pull request #11666 from tgstation/Fixing_bugs_from_browser_with_edit_button 
Fixes blood mixing not merging symptoms properly
 2015-09-09 12:48:52 -03:00
Cheridan
304d91fa2c Merge pull request #11606 from Firecage/gunnames 
This gives most projectile guns less generic names.
 2015-09-09 10:45:18 -05:00
Firecage
2a90cd109e Stetchkin pistol rename. 2015-09-09 17:36:14 +02:00
Razharas
c40dea1ebd Removes src and renames the argument 
Removes src and renames the argument
 2015-09-09 16:36:40 +03:00
duncathan
b86464f573 woo more runtimes 2015-09-08 22:59:18 -06:00
Cheridan
44033427a9 Merge pull request #11630 from bgobandit/slimepotionfixfuck 
Fixes/tweaks slime potions.
 2015-09-08 20:11:31 -05:00
Cheridan
dbcc6aeed8 Merge pull request #11650 from optimumtact/patch-9 
Better error messages for start game verb
 2015-09-08 20:06:14 -05:00
Razharas
524186e4db Merge pull request #11569 from Anonus/blobchemtweaks 
Changes blob chemicals
 2015-09-09 02:44:34 +03:00
Razharas
161156cffc Merge pull request #11585 from bgobandit/legitposters 
Poster changes!
 2015-09-09 02:38:56 +03:00
Razharas
54a58ddbf5 Fixes blood mixing not merging symptoms properly 
Fixes blood mixing not merging symptoms properly
Fix  #11482
 2015-09-09 01:46:04 +03:00
xxalpha
a62c09bbb7 Merge remote-tracking branch 'upstream/master' into dryshoes 
Conflicts:
	code/__DEFINES/misc.dm
 2015-09-08 16:56:37 +01:00
xxalpha
5adb732a66 Changed asteroid plating singularity pull to do nothing. 
Changed singularity act on asteroid plating to do nothing.:
 2015-09-08 15:59:35 +01:00
oranges
966ec11958 Adds game and attack logging to rags 
This adds a proc to help print reagent lists nicely
 2015-09-08 12:39:48 +12:00
Orange Borg
a9e4429d57 Better error messages for start game verb 2015-09-08 11:30:15 +12:00
Cheridan
daa5b5b48e Merge pull request #11599 from Firecage/Spiderwerbs 
Adds do_after to the spider verbs.
 2015-09-07 09:08:25 -05:00
bgobandit
dc16dfbcc2 Fixes/tweaks slime potions. 2015-09-07 09:48:31 -04:00
Razharas
9f0f1a9234 Merge pull request #11531 from RemieRichards/Bloody_footprints 
Bloody footprints!
 2015-09-07 16:07:03 +03:00
Remie Richards
f0d0a4bf2d Merge pull request #11528 from Aranclanos/undergoingevacuations 
Undergoing evacuations latejoin message fix
 2015-09-07 13:54:54 +01:00
Remie Richards
8b899636b2 Merge pull request #11604 from duncathan/itwaslessthan300000runtimessofranklyIammorethanokwiththis 
Fixes a BUNCH of atmos shit
 2015-09-07 13:49:01 +01:00
Jordie0608
08cfaf0b5f see jobban reasons from char setup 2015-09-07 20:44:08 +10:00
Firecage
42a28af718 Updated gun names. 2015-09-07 10:06:14 +02:00
Aranclanos
732aa1f5be Merge pull request #11600 from octareenroon91/patch-6 
Correct 'You inject' text
 2015-09-06 20:29:28 -03:00
Razharas
580e889e7d Merge pull request #11590 from joonoro/turbinefix 
Fix turbine
 2015-09-07 00:08:30 +03:00
duncathan
50fc7578f7 fixes TEG 2015-09-06 13:16:00 -06:00
bgobandit
c5984f4359 Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41G.dmm
 2015-09-06 13:27:51 -04:00
Firecage
63657bb2e7 Adjusts some gun names like sugggested. 2015-09-06 18:09:42 +02:00
Firecage
1b119f6aef Fixes the russian revolver name, my mistake. 2015-09-06 14:30:43 +02:00
Firecage
56925928eb places /improper in the gun names. 2015-09-06 14:27:54 +02:00
Firecage
9c341fb128 This gives most projectile guns less generic names. 2015-09-06 13:43:38 +02:00
Razharas
93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke 
Adds/tweaks several suicide messages.
 2015-09-06 06:42:00 +03:00
Razharas
889643deae Merge pull request #11564 from Jordie0608/thisbranchnameisalie 
Config announce admin login/out
 2015-09-06 06:40:15 +03:00
octareenroon91
1327441478 Correct 'You inject' text 
Injections will now correctly report the amount of reagent you inject. Lethal injection syringes specifically will report correctly.
 2015-09-05 16:47:21 -06:00
Firecage
d701946cd4 Adds do_after to the spider verbs. 2015-09-06 00:02:22 +02:00
Joonatan O'Rourke
ecbae74695 fix turbine computer 2015-09-05 10:45:57 +03:00
Aranclanos
ee458bb3db Merge pull request #11254 from duncathan/pipecleanup 
Pipe code cleanup
 2015-09-05 04:12:36 -03:00
Joonatan O'Rourke
77d91af82c fix turbine 2015-09-05 09:42:14 +03:00
Cheridan
a816ff5f8f Merge pull request #11385 from Aranclanos/extrapug 
Fixes pugs not following their tail.
 2015-09-04 23:20:25 -05:00
duncathan
4fc54c238c fixes components not gc'ing; minor tweaks to QDEL_HINT_FINDREFERENCE 2015-09-04 22:09:01 -06:00
bgobandit
261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
Jordie0608
b7754d5ed7 announce login message as a config 2015-09-04 21:49:09 +10:00
c0
df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Nerd Lord
4db08a755a Actually I think I prefer the old one, it's less red. 2015-09-03 17:28:04 -04:00
Nerd Lord
bfa73cad7d ah yes, chemistry code 2015-09-03 15:39:38 -04:00