cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,021 Commits 2 Branches 1 Tag
c6964a9b0e3f663931f7d71e1360fb23d65a3eca
Commit Graph

20340 Commits

Author SHA1 Message Date
Zuhayr
c6964a9b0e Fixes for previous commits. 2015-08-24 18:31:52 +09:30
Zuhayr
8bc72a465c Should fix AI-camera breaking when moved between cards. 2015-08-24 17:12:41 +09:30
Zuhayr
4429f027e7 Replacing hardcoded key/name checks in rig admin alert with key_name_admin(). 2015-08-24 16:44:17 +09:30
Zuhayr
e8bf2e4b8f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 2015-08-24 16:41:39 +09:30
Kearel
e8b779a34a language bug fix 2015-08-23 22:37:32 -05:00
PsiOmega
579c5be239 Makes observers use forceMove. 
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
 2015-08-23 17:45:46 +02:00
Zuhayr
9cbacd6653 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/click.dm
 2015-08-23 02:24:34 +09:30
GinjaNinja32
222049dd3c Merge pull request #10791 from Zuhayr/speciestweaks 
Species tweaks
 2015-08-22 17:50:43 +01:00
Zuhayr
90e51b87e3 Refactoring hardsuit click checking. 2015-08-23 02:14:55 +09:30
GinjaNinja32
2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
mwerezak
70241d576f Merge pull request #10803 from GinjaNinja32/manifest 
add manifest status command
 2015-08-22 09:47:57 -04:00
PsiOmega
f1323c35a9 Antags are now never eligible to be patient zero. 
Includes on-station antags. Fixes #10798.
 2015-08-22 14:38:08 +02:00
GinjaNinja32
aff57029e2 add manifest status command 2015-08-22 11:33:25 +01:00
PsiOmegaDelta
8f431c3832 Merge pull request #10801 from mwerezak/movement-cooldown 
Adds missing TK move cooldowns, fixes #10800
 2015-08-22 10:50:13 +02:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
mwerezak
a9f6d01647 Fixes #10800 
Also does some minor refactoring and removes a duplicate check
 2015-08-22 01:55:26 -04:00
mwerezak
d44e8cc0ab Adds missing TK move cooldowns, adjusts click move cooldowns 2015-08-21 23:21:54 -04:00
Chinsky
bd9b6fd4c6 Merge pull request #10771 from DelZeta/MRGLGRGLGR 
Fixes permahallucinations.
 2015-08-22 05:33:34 +03:00
Zuhayr
8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +09:30
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev 
Adds variables for CentComm, NanoTrasen and the station name.
 2015-08-21 14:23:57 -04:00
Zuhayr
1d13b989df Gluttonous var changes. 2015-08-22 03:33:18 +09:30
Zuhayr
23fa130d6a Species attack damage nerfs. 2015-08-22 03:33:18 +09:30
Zuhayr
6841776992 Taj/Unathi slowdown and burn/brute malus tweaks. 2015-08-22 03:33:18 +09:30
Zuhayr
69dfd23d1b Compile fix. 2015-08-22 03:26:41 +09:30
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
eb0f48d412 Xenos use bodytype for species_restricted, Vox can wear softsuits. 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 02:54:14 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
Zuhayr
a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/rig.dm
 2015-08-22 02:36:05 +09:30
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen 
Adds armor penetration system
 2015-08-22 02:22:17 +09:30
Zuhayr
55c1331261 Merge pull request #10004 from PsiOmegaDelta/150703-AISight 
Active AI cores now provides camera coverage.
 2015-08-22 02:21:36 +09:30
Zuhayr
a234d8b096 Merge pull request #10022 from PsiOmegaDelta/150705-SecretAdminDatums 
Admin secret panel refactor.
 2015-08-22 02:18:39 +09:30
Zuhayr
c0d2dc8ac1 Merge pull request #10787 from Zuhayr/papershredders 
Added paper shredders from Minijar.
 2015-08-22 02:11:04 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Zuhayr
545e465dfc Added paper shredders from Minijar. 2015-08-22 02:00:08 +09:30
Zuhayr
6c27a8dd8d Merge pull request #9159 from Kelenius/ofClicksAndCooldowns 
Removes click cooldowns almost everywhere.
 2015-08-22 01:51:05 +09:30
Zuhayr
3632acd3db Merge pull request #10786 from PsiOmegaDelta/150821-SortedAccess 
Cleans out unused access definitions and sorts access lists.
 2015-08-22 01:34:08 +09:30
Zuhayr
b4b7719557 Merge pull request #9888 from Vivalas/dev 
[DEV] Re-adds the new uplink item
 2015-08-22 01:34:01 +09:30
Kelenius
c1a0661eba Accidentally commited before saving the file. 2015-08-21 16:19:09 +03:00
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
PsiOmegaDelta
56523d0941 Cleans out (mostly) unused access definitions and makes access lists sorted. 2015-08-21 14:45:45 +02:00
PsiOmegaDelta
742dde5c25 Gives the medical equipment access a name. 
Requires for guest passes to list the entry. Fixes  #10780.
 2015-08-21 14:01:29 +02:00
PsiOmegaDelta
921015d6f3 Fixes computers with custom icon states. 
It broke the overlay system. Also makes the power monitoring computer use the overlay system.
 2015-08-21 09:50:39 +02:00
GinjaNinja32
c2cdf9d237 add round duration to status reply 2015-08-21 06:28:44 +01:00
DelZeta
54dd93997d Useful procs are useful. 2015-08-20 20:24:15 -07:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
Chinsky
b2e9a7c2a6 Merge pull request #9942 from RavingManiac/dev 
Sound environment revamp
 2015-08-20 19:47:09 +03:00