cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,754 Commits 2 Branches 1 Tag
bcc6ac03e349bbf95f0558033ff18cacaccc5ca5
Commit Graph

183 Commits

Author SHA1 Message Date
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and 
construction/deconstruction. Major map rework/changes.
 2015-08-16 06:05:21 -07:00
Chinsky
54cb084113 Merge pull request #9997 from PsiOmegaDelta/150702-MoneyMoneyMoney 
Economic strength now depends on race and job.
 2015-08-14 03:56:57 +03:00
PsiOmegaDelta
c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney 
Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm
 2015-08-13 08:06:11 +02:00
Kelenius
60196df634 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/modules/projectiles/gun.dm
 2015-08-13 08:40:31 +03:00
Kelenius
012fb38de2 Finalizes mechfab 2015-08-12 21:46:11 +03:00
mwerezak
11d959e767 Adds client image based t-scanner 
Replaces the t_scanner implementation with one that sends overlays to the client holding the t-ray item. Fixes #9437
 2015-08-08 22:26:38 -04:00
Neerti
95240c989b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-08-03 22:13:18 -04:00
PsiOmega
8679887b17 Code relocation. 2015-08-01 19:46:35 +02:00
PsiOmegaDelta
7e6cb6f38c Compilation/definition fixes. 2015-07-31 10:05:42 +02:00
PsiOmegaDelta
353f685339 Moves code to relevant define. 2015-07-31 10:00:34 +02:00
PsiOmegaDelta
de3c24c29f Code relocation. 2015-07-30 10:58:03 +02:00
Neerti
8152ce0676 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync 
Conflicts:
	polaris.dme
 2015-07-29 03:45:53 -04:00
PsiOmegaDelta
ff2b3865b8 Compilation fixes. 2015-07-27 10:41:21 +02:00
Neerti
6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-16 22:46:53 -04:00
PsiOmegaDelta
8457488755 Re-adds the Clamp defines. 2015-07-11 11:23:55 +02:00
Woodrat
c5b30257f7 Neerti is Satan, updates map. Updates files. 2015-07-07 20:31:00 -07:00
PsiOmega
f96ad8ca40 NTs relationship towards you now affects the pay grade. 2015-07-02 23:03:55 +02:00
Chinsky
0e6aea6842 Merge pull request #9957 from mwerezak/hats 
Updates hats to use item_state_slots where necessary
 2015-07-01 06:56:21 +03:00
mwerezak
32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
PsiOmegaDelta
cc1ca0e616 Compilation fixes. 2015-06-30 09:01:51 +02:00
Zuhayr
b0a5705fa8 Makes suits usable with the icon state system. 2015-06-30 12:15:06 +09:30
mwerezak
087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-06-28 22:35:14 -04:00
mwerezak
309dff6aba One less object verb 2015-06-27 23:54:20 -04:00
mwerezak
c7ff5eebe3 Updates hats to use item_state_slots where necessary. 2015-06-27 23:33:33 -04:00
PsiOmegaDelta
99ba26f1ee It is no longer possible to define the amount of telecrystals per game mode. 2015-06-18 10:59:45 +02:00
PsiOmegaDelta
4deba764a0 Compilation fixes. 2015-06-17 09:41:13 +02:00
PsiOmega
ee88e7b8b4 Base Life-addition() 2015-06-13 13:36:08 +02:00
Kelenius
0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
 2015-06-07 14:05:54 +03:00
PsiOmega
b5c0478ae2 Fixes compilation errors. 2015-06-07 11:14:06 +02:00
Chinsky
4b04ccb05d Axed couple unused organ flags, made them look a bit nicer with bitmove 2015-06-05 11:18:07 +03:00
Chinsky
e5a8eb2dfc Actually renames 'going' var. 
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
 2015-06-05 11:07:24 +03:00
Chinsky
ad0652d864 Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var). 2015-06-04 22:51:15 +03:00
Chinsky
bf53304fec Splits setup.dm into berjillion of smaller files vaguely named thematically. 
Also moved __HELPERS and _defines around so defines actually come first.
 2015-06-04 21:51:58 +03:00