cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-19 05:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,271 Commits 61 Branches 14 Tags
2ab5701b97cd7ce92c6fd3911db7fc4d98337a4e
Commit Graph

12320 Commits

Author SHA1 Message Date
paprka
2ab5701b97 Merge branch 'lolnames' of https://github.com/paprka/-tg-station into lolnames 2014-11-14 14:09:44 -08:00
paprka
03e07d5a56 Missed capitalization in a vendor name 2014-11-14 14:09:17 -08:00
paprka
aa2ecbec99 Fixes a missed capitalization issue 2014-11-13 18:20:57 -08:00
paprka
fe94f9cab0 Fixes a bunch of capitalization inconsistencies, adds names to vendors 2014-11-12 15:37:21 -08:00
hornygranny
f00d32abc1 Merge pull request #5803 from Menshin/sleeping_in_closets 
Removes hilarious but useless sleep() in closets/boxes creation
 2014-11-11 10:55:07 -08:00
Cheridan
242ec7e54c Merge pull request #5742 from Menshin/Maploader_fix 
Maploader fix
 2014-11-11 10:16:39 -06:00
hornygranny
ace3848ed8 Merge pull request #5801 from tkdrg/spessspeed 
Speeds up space movement a little bit
 2014-11-10 20:19:54 -08:00
hornygranny
0dae1b7c97 Merge pull request #5800 from Miauw62/roundstartruntimevolume1 
Fixes some roundstart runtimes relating to set_species().
 2014-11-10 17:12:15 -08:00
hornygranny
d4a5d2ba1f Merge pull request #5786 from Miauw62/runtime1 
Fixes some RD console runtimes.
 2014-11-10 08:43:10 -08:00
hornygranny
1804703de5 Merge pull request #5792 from tkdrg/tubedispenserfix 
Fixes lack of sanity for transit tube dispensers
 2014-11-10 08:28:03 -08:00
hornygranny
d39265bb55 Merge pull request #5717 from phil235/FireaxecabinetBulletFix 
Fireaxecabinet bullet fix
 2014-11-10 08:22:38 -08:00
hornygranny
d1a50653a0 Merge pull request #5756 from MrPerson/flash_aaaaaaaaah_he'll_save_every_one_of_us 
Fixes a runtime with flashers
 2014-11-10 08:20:30 -08:00
hornygranny
aa888ada65 Merge pull request #5753 from tkdrg/signalerruntime 
Fixes #5604 signaler runtime
 2014-11-10 08:20:10 -08:00
hornygranny
9713794835 Merge pull request #5762 from tkdrg/hopefullythelast 
Fixes burn_tile runtime
 2014-11-10 08:19:46 -08:00
Swag McYolosteinen
7ce90ff54a Merge pull request #5654 from GunHog/Potato_AI_Wants_To_Hear_You_Scream_Too 
Gives Traitor AIs the Syndicate Channel!
 2014-11-10 17:18:04 +01:00
hornygranny
fa735ea9ed Merge pull request #5768 from paprka/mophands 
Fixes no inhand for advanced mop
 2014-11-10 08:16:22 -08:00
hornygranny
1cbfe107b5 Merge pull request #5751 from Miauw62/blugh 
Fixes border window phasing.
 2014-11-10 08:15:46 -08:00
hornygranny
5428ed7d5d Merge pull request #5749 from Miauw62/vov 
Fixes an edge case where clones could talk, take 2.
 2014-11-10 08:15:33 -08:00
Swag McYolosteinen
9893fbc86f Merge pull request #5645 from Ergovisavi/firefighting 
Firefighting changes
 2014-11-10 16:55:38 +01:00
Cheridan
1b6b7d0d94 Merge pull request #5624 from paprka/glasstables 
[MAP] Table construction overhaul
 2014-11-09 21:37:10 -06:00
Cheridan
5514f6f644 Merge pull request #5765 from tkdrg/reactconstruct 
Adds check_shields() to attack_animal and friends
 2014-11-09 21:19:21 -06:00
Menshin
cdd5128d47 Removed hilarious but useless sleep() in closets/boxes New() 2014-11-10 01:59:32 +01:00
paprka
9af72bda1f compile fixes 2014-11-09 15:01:46 -08:00
paprka
0ffba02112 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/objects/structures/tables_racks.dm
 2014-11-09 14:53:19 -08:00
Remie Richards
07fd45845a Merge pull request #5655 from paprka/removingbullets 
Last minute changes to guns for massive realism
 2014-11-09 22:10:20 +00:00
Ergovisavi
481a282ca8 Adds NODROP to the Atmos watertank nozzle. I have no regrets. 2014-11-09 13:56:12 -08:00
tkdrg
170e9573fa Speeds up space movement a little bit. 2014-11-09 17:37:01 -03:00
Miauw
6ee0862c05 Fixes some roundstart runtimes relating to set_species(). 2014-11-09 21:01:42 +01:00
Ergovisavi
2c74fc8dbb -Adds secure atmos closets to Atmos 
-Removes a redundant check in water's obj reaction, add's a "cooling power" var that determines how effective it is at cooling off hotspots
-Modifies extinguishers a bit to have more options, affect more tiles, change the cooling temperature of the water inside of it, etc
-Makes the water backpack for atmos even more robust at fighting fires with a 5 tile spread, removes converting oxygen to nitrogen on Nanofrost, made the resulting end of a firefight annoying as the atmos tech would have to get an oxygen canister
-Makes racks use Move() to put objects on top of them instead of just changing the loc, in order to stop nozzles/misters from getting on them
 2014-11-09 11:16:58 -08:00
GunHog
4bc6ded418 Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too 
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
 2014-11-09 12:27:48 -06:00
tkdrg
1b92194a99 Fixes lack of sanity for transit tube dispensers (thanks Alek2ander for the help!) 2014-11-09 13:01:44 -03:00
Aranclanos
9b89f9160d Adds mechfabricator_designs.dm, a file with all the default designs for the exosuit fabricator. 
Updates the .dme file to add the new file.
 2014-11-09 11:41:24 -03:00
Miauw
28605093e2 Fixes some RD console runtimes. Fixed #5783 2014-11-09 13:59:25 +01:00
Cheridan
04c5e33f1c Merge pull request #5576 from GunHog/Rapid_Part_Exchange_And_Installation_Device 
RPED Expansion
 2014-11-09 00:59:57 -06:00
GunHog
dd7bfbff59 Adds a sound for the RPED! 
When used to exchange or install parts, the RPED will play a cool
machiney sound! Sound by Cuboos.
 2014-11-08 23:49:04 -06:00
paprka
9be60df479 fixes no inhand for mop 2014-11-08 19:28:13 -08:00
Cheridan
86d0422881 Merge pull request #5739 from hornygranny/lattices 
lattice and grille deconstruction refactor
 2014-11-08 21:21:53 -06:00
GunHog
3d6f946bcf Merge remote-tracking branch 'remotes/upstream/master' into Rapid_Part_Exchange_And_Installation_Device 
Conflicts:
	code/defines/obj/weapon.dm
 2014-11-08 19:16:49 -06:00
GunHog
e859375d3e RPED Installation Complete Fix + Circuit changes 
- The RPED now sorts its parts when installing new equipment - It will
always use the best parts contained within.
- Made all the req_component lists of circuitboards actual paths instead
of pure text. Hopefully I fixed everything that broke when I did that.
 2014-11-08 19:11:04 -06:00
hornygranny
e392609b6f Merge pull request #5425 from Menshin/meteor_redux 
Meteors redux
 2014-11-08 15:24:44 -08:00
hornygranny
62003a8ab8 Merge pull request #5700 from RemieRichards/SiliconLawCap 
Adds a config option to cap silicon laws. [NEW CONFIG OPTION]
 2014-11-08 15:22:09 -08:00
hornygranny
9eb231be23 Merge pull request #5734 from paprka/removeborgnvg 
Fixes borg mesons giving them pseudo night vision
 2014-11-08 15:21:23 -08:00
hornygranny
3a316dc233 Merge pull request #5111 from Perakp/removeAbsorbObjective 
Remove absorb objective and other changes to changeling
 2014-11-08 15:18:44 -08:00
hornygranny
71efbeef26 Merge pull request #5213 from Miauw62/whatthefuckareyouevensupposedtocallthesebranchesffs 
Fixes whisper formatting hopefully maybe.
 2014-11-08 15:12:59 -08:00
hornygranny
d15a44ca94 Merge pull request #5722 from Aranclanos/mechfabricators 
Exosuit fabricator revamp
 2014-11-08 15:10:58 -08:00
hornygranny
3f979d3aa1 Merge pull request #5695 from Aranclanos/lelerrocode 
more VV logging and mass-modify proper admin-rights
 2014-11-08 15:09:21 -08:00
hornygranny
d0d6947dad Merge pull request #5719 from MrPerson/pls_dont_make_fun_of_the_singulo_shes_not_fat_just_big_boned 
Singularity tweaks
 2014-11-08 15:08:40 -08:00
hornygranny
4ff8507c85 Merge pull request #5727 from phil235/RecorderFix 
Fixes the tape recorder. (one typo)
 2014-11-08 15:07:47 -08:00
hornygranny
28592a230e Merge pull request #5737 from phil235/GrabbyPunchyFix 
Adding a NOBLUDGEON check to simple_animal/attackby()
 2014-11-08 15:07:18 -08:00
tkdrg
a394832f96 Adds check_shields() to attack_animal and friends 2014-11-08 19:16:54 -03:00