cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 12:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,494 Commits 61 Branches 14 Tags
f7730eeaefff73eb65b3c8a6d131c6f79df6c641
Commit Graph

1070 Commits

Author SHA1 Message Date
tkdrg
d7a942901f Merge pull request #7159 from Jordie0608/whatdothenumbersmean 
Prevents permabans from noting as 0 minute bans
 2015-01-24 15:18:56 -03:00
Jordie0608
de2965a939 changed note check to temp 2015-01-25 02:22:28 +11:00
Steelpoint
d82736a3c3 MoreRefinment 2015-01-23 02:19:17 +08:00
Steelpoint
a5c1faafb6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1 2015-01-22 03:24:54 +08:00
tkdrg
13a7d6d61b Merge pull request #7173 from Carn/#6971 
Resolves #6971 - non-lighting_subarea areas are now stored in list/sorte...
 2015-01-21 05:06:25 -03:00
Cheridan
793243763d Merge pull request #7185 from paprka/inhandrefactor 
Inhand refactor
 2015-01-20 22:16:06 -06:00
Steelpoint
ad04ce62a0 AllAccess+EasierSuitIdentification 2015-01-20 20:53:13 +08:00
tkdrg
a9160e52dc Merge pull request #7105 from Carn/#6993 
Resolves #6993 - Moved pai controller into a subsystem.
 2015-01-19 20:17:14 -03:00
paprka
2706be1190 optimizations to the way inhand files are found 2015-01-18 21:14:47 -08:00
paprka
88230fabfa inhand refactor 2015-01-18 20:58:31 -08:00
carnie
f4c35d2a78 Resolves #6971 - non-lighting_subarea areas are now stored in list/sortedAreas. This list is sorted by area name using timSort only when areas are added to it. Currently the only other thing that adds to this list is the station-blueprints object. 
This allows you to jump to areas by name, rather than type.
 2015-01-18 20:46:30 +00:00
Jordie0608
ee25f2e069 Prevents permabans from noting as 0 minute bans 2015-01-18 16:15:29 +11: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
63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2 
[FEATURE] Emergency Response Team V2
 2015-01-15 23:41:20 -06:00
carnie
a44795a699 Resolves #6993 - Moved pai controller into a subsystem. 2015-01-15 23:50:46 +00: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
paprka
8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08:00
Steelpoint
3f88acb6f6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 
Conflicts:
	icons/mob/head.dmi
 2015-01-14 11:25:07 +08:00
paprka
3ce1bf233f fixes some compile errors with my previous PR 2015-01-13 00:45:58 -08:00
Cheridan
1c090e02b7 Merge pull request #6787 from paprka/serviceandsupply 
Separates supply from civilian (service) jobs
 2015-01-13 02:19:30 -06:00
Steelpoint
64ba51c0b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 2015-01-13 12:52:24 +08:00
carnie
a9bd2739c8 Resolves #6947 - misuse of rand() meant that the multiplier for fake recalls was sometimes getting set to 0, meaning shuttle was never recalled. 2015-01-11 20:55:00 +00: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
Steelpoint
982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Swag McYolosteinen
404cd883f7 Merge pull request #6705 from Steelpoint/EmergencyResponseTeam 
[FEATURE] Emergency Response Team
 2015-01-10 10:10:59 +01:00
tkdrg
179003b57c Merge pull request #6808 from Boggart/readminbugfix 
Re-admin bugfixes.
 2015-01-10 01:29:01 -03:00
Steelpoint
ccdf83b8af QuickTidyUp 2015-01-09 11:28:55 +08:00
Steelpoint
34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi
 2015-01-09 11:02:50 +08: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
Steelpoint
b0fe1d9818 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-08 02:09:02 +08:00
carnie
4bcc5ec791 Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb. 2015-01-07 17:13:23 +00:00
Steelpoint
5f77b95b23 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 01:38:38 +08:00
Remie Richards
f918815bea Merge pull request #6741 from tkdrg/atmoslog 
Adds atmos investigate_log
 2015-01-06 07:56:17 +00:00
Remie Richards
76897893bd Merge pull request #6642 from tkdrg/toupper 
Improves Permission Panel security, take 2
 2015-01-06 07:24:03 +00:00
Steelpoint
ec821c33d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm
 2015-01-06 12:17:29 +08: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
Steelpoint
082f62bf3d NameTweaking+VisibleLoyaltyImplant+MovingSecOfficersSecHUDToObviousLocation 2015-01-06 02:57:05 +08:00
Steelpoint
3e37a8e562 MissedANumber 2015-01-05 20:23:05 +08:00
Steelpoint
49ea9b0543 EmergencyResponseTeam-AntagSelectionForAdmins 2015-01-05 20:20:11 +08:00
Boggart
5f42bac272 Fixes deadmins from being unable to re-admin after disconnecting. 2015-01-05 00:50:49 -07:00
Boggart
57f69f17e4 Moves the removal of the re-admin verb to the admin holder's associate proc to prevent reload_admins and any other method of re-adminning someone from leaving them with the re-admin verb. 2015-01-04 19:30:20 -07: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
8527f23d85 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 2015-01-03 17:05:27 -08:00
Boggart
bb6125a5f1 Fixes feedback on failure due to null rank or disconnected DB. Sanitizes ckey in DB query. 2015-01-02 13:24:49 -07:00
paprka
46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
Boggart
aed9d6b0e2 Fixes some tabs being spaces. 2015-01-01 23:05:32 -07:00
Boggart
2b0932047a Improves feedback to the user of the re-admin verb. 2015-01-01 23:02:18 -07:00
Boggart
0ceda7939c Adds the ability for admins to re-admin themselves once they de-admin. 2015-01-01 20:42:53 -07:00