cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 10:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 62 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

1736 Commits

Author SHA1 Message Date
Miauw
b6b17e214f After-merge cleanup. 2015-01-29 18:51:31 +01:00
Miauw
e1d3799f9d Removes a debug message. 2015-01-29 18:50:51 +01:00
Miauw
04ad06eca0 Fixed #126. MMIs and pAIs can now be teleported properly. 
Revamped the AI get/jump procs to use admin_forcemove(), which makes sure that mobs are moved by setting various vars and then calling Move().
 2015-01-29 18:50:48 +01:00
Steelpoint
18fe642fcc ERTBalanceV2 2015-01-29 19:03:07 +08:00
hornygranny
02630dcb45 Merge pull request #7379 from Menshin/jump_to_area_fix 
Jump_to_area bugfixing
 2015-01-28 14:33:59 -08:00
Menshin
9af151878d Added a "Send back to Lobby" option in Player Panel. 2015-01-28 18:45:26 +01:00
paprka
e507cd31d8 Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit 2015-01-27 17:12:59 -08:00
Swag McYolosteinen
58648d267e Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas 
Shuttle Stranding
 2015-01-27 17:55:26 +01:00
paprka
b830f77ea2 Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-26 15:37:33 -08:00
Menshin
1534c82240 * Build the area list at world startup 
* Fix the station areas not being processed in the jump_to_area proc
 2015-01-26 19:09:05 +01:00
paprka
c43092efa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 2015-01-25 21:56:39 -08:00
Deantwo
6bed1a71ce View Own Notes Readabily Fix 
Adds a line brreak ("<br>") after each note.
 2015-01-25 10:46:27 +01:00
paprka
a5a9e297d4 new hood system 2015-01-25 00:22:52 -08:00
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
paprka
5361458b51 some updates 2015-01-23 21:00:09 -08:00
Steelpoint
d82736a3c3 MoreRefinment 2015-01-23 02:19:17 +08:00
Incoming
f6380f385e Removed some now obsoleted code 
Fixed an edge case
 2015-01-21 23:28:48 -05: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
64ce7ea958 Advanced ProcCall improvements & Atom ProcCall 
You can now right click an atom to call a proc on it if you have +DEBUG.
Also cleaned up callproc() code a bit.
 2015-01-14 18:47:05 -03: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