coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,874 Commits 9 Branches 11 Tags
8b2175b5e9736acbadb94deff4ac27ca6870ba02
Commit Graph

655 Commits

Author SHA1 Message Date
Sometinyprick 98edcffb7d oops 2015-02-13 17:29:22 +00:00
Sometinyprick 2cbff9e2dd admins are thing 
thing of admins
 2015-02-13 17:00:51 +00:00
Cheridan 0db4c09326 Merge pull request #7573 from xxalpha/schizo 
Hear the voice of the chosen deity in your head.
 2015-02-11 09:52:05 -06:00
Kraseo 80191947e2 ERT now spawn with random names because cheri hates fun 2015-02-09 20:10:29 +01:00
Kraseo 08e7911f57 fixes a bunch of bugs 2015-02-08 13:27:55 +01:00
xxalpha e894fdc6c1 You will hear the voice of the chosen god in your head. 
Remove text macros
 2015-02-06 00:54:35 +00:00
paprka 6de33d4063 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 
Conflicts:
	_maps/map_files/generic/z2.dmm
 2015-02-02 19:13:49 -08:00
Swag McYolosteinen 9bddcb3df4 Merge pull request #7492 from xxalpha/spacesuit_storage 
Repath all non jetpack tank types to tank/internals
 2015-02-02 18:52:51 +01:00
paprka e4262d21a5 nanite injector for med ert 2015-02-02 06:24:16 -08:00
paprka d232086ff5 small bandaid fix 2015-02-02 03:54:24 -08:00
paprka 18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
paprka a5dcd1abd8 improves ert spawning and centcomm 2015-02-01 21:16:11 -08:00
paprka 55bdca20da Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 2015-02-01 18:22:02 -08:00
Cheridan f8bb02d54a Merge pull request #7422 from Steelpoint/ERTBalance2 
ERT Balance Pass 2 | ERT Access and Foam
 2015-02-01 20:16:04 -06:00
xxalpha a9c181bbcc Repath all non jetpack tank types to tank/internals 
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
 2015-02-01 18:25:39 +00:00
paprka 453a3db196 etc 2015-01-30 23:18:02 -08:00
hornygranny f7659eb4e5 Merge pull request #7426 from Miauw62/ye_olde_bugfix 
fixes MMI and pAI teleporting
 2015-01-29 10:51:12 -08:00
Swag McYolosteinen 3bb7213d14 Merge pull request #7346 from paprka/hoodshit 
New hood/hardsuit helmet system
 2015-01-29 18:57:25 +01:00
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
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
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 a5a9e297d4 new hood system 2015-01-25 00:22:52 -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
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
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
paprka 8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08: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
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
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
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