cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-23 23:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,187 Commits 61 Branches 14 Tags
1647bbd6039684ccf3d8dfffb774de92df32e1df
Commit Graph

1224 Commits

Author SHA1 Message Date
tkdrg
98ecd7ffdc Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup 
Goon Chemistry: Addiction and Overdosing
 2015-01-19 03:32:57 -03:00
Iamgoofball
b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
paprka
a2fe7f0352 bloat killer 9000 2015-01-17 16:36:27 -08:00
Iamgoofball
35cc6e3c54 Replaces pathing. 2015-01-16 18:21:01 -08:00
Iamgoofball
38070820f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup 2015-01-16 17:25:50 -08:00
Iamgoofball
f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
paprka
ab7d50c90e Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess 
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi
 2015-01-15 21:56:23 -08:00
Cheridan
5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
tkdrg
674b3b65c0 Merge pull request #6968 from phil235/LockdownMalfFix 
Fixes malf AI lockdown affecting doors on away missions
 2015-01-14 14:58:10 -03:00
tkdrg
7fe46696d2 Merge pull request #6963 from Boggart/wizrepulse 
Adds a new spell, Repulse.
 2015-01-14 14:36:00 -03:00
Boggart
a54b57f629 Adds span classes to repulse spell. 2015-01-14 02:02:17 -07:00
tkdrg
82bff079c7 Merge pull request #6137 from Iamgoofball/byond 
Goon Chemistry [FINISHED]
 2015-01-14 02:31:56 -03:00
paprka
8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08:00
Swag McYolosteinen
430b613ef4 Merge pull request #6984 from tkdrg/sanitaiz 
Replaces a bunch of input() with stripped_input()
 2015-01-13 19:32:25 +01:00
Cheridan
1c090e02b7 Merge pull request #6787 from paprka/serviceandsupply 
Separates supply from civilian (service) jobs
 2015-01-13 02:19:30 -06:00
Cheridan
4bd70b2908 Merge pull request #6986 from Menshin/ear_damage_ooping 
Ear damage/deafness tidying
 2015-01-13 01:19:56 -06:00
Cheridan
6679b67b89 -Adds pin supply pack 
-Updates armory
 2015-01-12 23:35:57 -06:00
Iamgoofball
5a91ce4fee Requested changes by @Cheridan 2015-01-12 20:38:56 -08:00
Cheridan
f8e1fac30c Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-12 21:29:00 -06:00
Menshin
435ccf7ff9 * OOP'ed ear damages/deafness status updating 
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
 2015-01-13 00:40:46 +01:00
tkdrg
b852aa41ea Replaces a bunch of input() with stripped_input() 
Some of these were exploitable for XSS, as well.
 2015-01-11 19:02:53 -03:00
Iamgoofball
493dd27679 Merge branch 'master' of https://github.com/tgstation/-tg-station into byond 
Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/reagents/reagent_containers/glass/bottle.dm
 2015-01-11 09:53:49 -08:00
phil235
a55e6a70be Fixes malf AI lockdown affecting doors on z levels other than station and mining. 
Replaces a lot of z level numbers in code by their respective defines.
Adding a define for the Mining asteroid z level.
 2015-01-11 15:39:32 +01:00
Boggart
1d9f7a9a51 Tweaks the upgrade benefit for repulse a bit. 2015-01-11 01:09:28 -07:00
Boggart
27e4192c26 Gives repulse an overlay on thrown things and fixes the spellbook entry for it. 2015-01-10 23:17:25 -07:00
Razharas
a6ae15215a Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes 2015-01-11 08:48:03 +03:00
Razharas
bfda5b49f9 Last pack of fixes for now 
Fixed indentation in transform proc
Moved comments to appropriate place
Fixed unreported cloning bug
Removed monkifying from random bad mutations
 2015-01-11 08:23:50 +03:00
Boggart
cb43a8d69f Adds repulsion spell for wizards. 2015-01-09 23:43:41 -07:00
Cheridan
0956a86c22 Firing Pin System - The Lockbox Solution 2015-01-09 18:49:02 -06:00
Nienhaus
4d34f2235e Fox 2.0 
https://github.com/tgstation/-tg-station/pull/6489/
 2015-01-09 16:41:37 -06:00
tkdrg
40e5476a53 Merge pull request #6598 from Incoming5643/InstantSummons 
Magic Mania 1.81: Instant summons!
 2015-01-09 03:29:15 -03:00
tkdrg
69280f6b9b Merge pull request #6879 from dannno/bandolier 
Adds shotgun bandoliers
 2015-01-08 22:47:09 -03:00
hornygranny
56bad0f7ce Merge pull request #6747 from paprka/gunchangesv2baby 
Further changes to the ranged stun system
 2015-01-08 16:09:37 -08:00
Razharas
f48563f1d1 Fixes some bugs and rutimes tkdrg pointed 
Monkeys arent blind anymore
Bad dna mutation runtime fixed
Two handed shit runtime fixed
Carbons unarmed attacks runtime fixed
 2015-01-08 22:35:07 +03:00
dannno
c76072608a bamboliers 2015-01-07 20:28:16 -05:00
Remie Richards
186ee1a5d6 Merge pull request #6778 from tkdrg/fuk-u 
Fixes crash bug in the byond beta
 2015-01-06 19:32:51 +00:00
Razharas
8a14a49041 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenFixes 2015-01-06 15:41:38 +03:00
Razharas
fddb333a7a General fixes of bugs caused by mutations 
Fixes visibility in crit
Fixed xray and nightvision not working
Fixed dna changing diseases
Fixed hulks doing damage on all intents
Fixed transform procs sometimes breaking dna forever
 2015-01-06 15:38:40 +03:00
paprka
f0712db606 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
 2015-01-05 18:43:46 -08:00
paprka
84a943d87c adds supply job list 2015-01-03 19:49:26 -08:00
carnie
a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-01-04 01:52:14 +00:00
paprka
c3132422fb one more name revert 2015-01-03 17:24:01 -08:00
paprka
460a06e683 Reverted some other magazine name changes 2015-01-03 17:23:31 -08:00
paprka
7324891c37 intense p90 fans on /tg/ apparently 2015-01-03 17:21:23 -08:00
paprka
8527f23d85 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 2015-01-03 17:05:27 -08:00
Incoming
69aea446a3 Fixes conflicts 
Adds handling for canister teleportation shinanagans
Refactors nozzles slightly so they act properly if someone manages to swipe the tank without it ever touching the floor
 2015-01-03 17:15:08 -05:00
tkdrg
fb8346ba8d Fixes crash bug in the byond beta 
Don't use unicode in byond jesus christ, this crashes DS on 507.1274
 2015-01-03 15:53:14 -03:00
paprka
46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
tkdrg
84e3eaaf16 Merge pull request #6676 from Jordie0608/beeverycarefulwiththese 
Adds bee and butterfly disease to virus pack
 2015-01-02 02:33:23 -03:00
iamgoofball
221385f884 Merge branch 'master' of https://github.com/tgstation/-tg-station into byond 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2015-01-01 11:51:43 -08:00