cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,329 Commits 2 Branches 1 Tag
a6d9002806d7bccd14dd127dc96930815dc45c99
Commit Graph

19825 Commits

Author SHA1 Message Date
PsiOmegaDelta
a6d9002806 Merge pull request #10442 from Baystation12/dev-freeze 
Dev freeze
 2015-08-07 10:37:47 +02:00
PsiOmegaDelta
8ca5d01dcf Crematorium Destroy() 
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
 2015-08-06 08:39:24 +02:00
PsiOmegaDelta
863832b347 Post-merge fixes. 
Renames define.
Re-corrects access checks.
 2015-08-06 08:18:39 +02:00
PsiOmegaDelta
03578d4ea3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-06 08:12:38 +02:00
PsiOmegaDelta
87fcd408bd Merge pull request #10436 from mwerezak/cult-construct-nightvision 
Adds nightvision to cult constructs
 2015-08-06 06:38:49 +02:00
mwerezak
0bc9468022 Merge pull request #10431 from PsiOmegaDelta/150805-HoloRuntime 
Fixes holodeck runtime.
 2015-08-05 23:06:04 -04:00
mwerezak
e5950d32d8 Merge pull request #10264 from RavingManiac/dev-freeze 
Refactors floating and magboot checks. Fixes #10256
 2015-08-05 23:05:34 -04:00
PsiOmegaDelta
cf1ffd273a Fixes holodeck runtime. 
initial() doesn't work well with lists. Causes a null value.
 2015-08-05 09:33:34 +02:00
PsiOmegaDelta
73a9c24017 Removes code in mob/living/bot/Life() that is now handled by mob/living/Life(). 2015-08-05 09:26:43 +02:00
PsiOmegaDelta
3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta
6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
 2015-08-05 09:16:50 +02:00
GinjaNinja32
c71d78ab1a add debug verb as pAI-spawning adminverb 2015-08-05 00:50:04 +01:00
GinjaNinja32
595b58197d fix pAI radios not working 2015-08-05 00:49:28 +01:00
mwerezak
9ee2482fda Merge pull request #10422 from PsiOmegaDelta/150804-SomeOfYouPeopleAreSoPicky 
Uses raised TM symbol in the mirror name.
 2015-08-04 16:27:34 -04:00
Chinsky
7a4ba68abe Merge pull request #10419 from mwerezak/gamemode 
Fixes #10403
 2015-08-04 17:08:51 +03:00
GinjaNinja32
117ffca6d0 Merge pull request #10423 from Kelenius/ofBotsAndZAS 
Of bots and ZAS
 2015-08-04 13:26:30 +01:00
GinjaNinja32
9a4b53c765 Merge pull request #10360 from atlantiscze/beep-beep-beepsky 
Fixes #10355
 2015-08-04 12:36:35 +01:00
PsiOmegaDelta
93011f94c4 Merge pull request #10425 from Baystation12/dev-freeze 
Dev
 2015-08-04 13:07:11 +02:00
Kelenius
e935baf1d8 Fixes #10418 - bots don't remover from stuns 2015-08-04 12:41:32 +03:00
PsiOmegaDelta
4d57f5ef66 Uses raised TM symbol in the mirror name. 
Now uses the HTML code for the trademark symbol.
 2015-08-04 10:41:28 +02:00
mwerezak
d25d0c700c Fixes #10403 
can_start() no longer attempts to rebuild the antag candidate lists but
instead reads the existing lists that are now built in pre_setup()

Also fixes an inverted check that was preventing antags from spawning.
 2015-08-03 20:01:55 -04:00
GinjaNinja32
70c302ad03 Merge pull request #10415 from PsiOmegaDelta/150803-LightingRuntime 
Fixes #10409.
 2015-08-04 00:47:11 +01:00
GinjaNinja32
a099fc4401 Merge pull request #10413 from PsiOmegaDelta/150803-Cleanup 
Removes debug proc.
 2015-08-04 00:46:40 +01:00
mwerezak
76ceaa904b Fixes admin or event spawned antags not spawning 
Pending players were selected but the antag roles were never finalized.
 2015-08-03 12:06:23 -04:00
mwerezak
2e1607f611 Fixes #10414 
Antagonists are again drafted in attempt_spawn() and all players in the pending list will be spawned (provided they pass sanity checks).
Instead, attempt_spawn() is called in either pre_setup() or post_setup() depending on if the ANTAG_OVERRIDE_JOB flag is set. And all antags have
their spawning finalized in post_setup().

In addition, if game mode setup fails, all pending antagonist players have their special roles cleared.
 2015-08-03 12:03:08 -04:00
RavingManiac
aeea42ded9 Refactors floating and magboot checks. Fixes #10256 2015-08-03 23:19:04 +10:00
PsiOmegaDelta
c25212463a Fixes #10409. 
Ports https://github.com/ParadiseSS13/Paradise/pull/1622.
 2015-08-03 10:15:24 +02:00
PsiOmegaDelta
34ad83baae Removes debug proc. 
It isn't needed.
 2015-08-03 09:31:40 +02:00
PsiOmegaDelta
998b72bcd8 Fixes #10372. 
Removes snowflake attack code.
 2015-08-03 09:20:36 +02:00
Atlantis
ad45e5d16b Implements req_one_access for bots, as per request on GitHub discussion. 2015-08-02 23:23:18 +02:00
PsiOmega
8679887b17 Code relocation. 2015-08-01 19:46:35 +02:00
PsiOmega
f8d86900a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm
 2015-08-01 19:45:42 +02:00
PsiOmegaDelta
f8799035f4 Merge pull request #10400 from Baystation12/master 
Master -> Dev-Freeze
 2015-08-01 19:44:22 +02:00
mwerezak
f2bfc5a720 Merge pull request #10397 from Zuhayr/dev-freeze 
Fixes
 2015-08-01 13:02:23 -04:00
mwerezak
b5e503c2ff Merge pull request #10399 from GinjaNinja32/callproc 
Change callproc to check validity earlier
 2015-08-01 12:24:13 -04:00
GinjaNinja32
495f80fff6 Change callproc to check validity earlier 
Callproc now checks validity of a call *before* prompting for arguments, instead of after, and can now check the validity of global (/proc/foo) procs.
 2015-08-01 17:19:36 +01:00
Zuhayr
71433e024d Merge pull request #10388 from mwerezak/light-suit 
Cybersuit and sprite fixes
 2015-08-02 01:13:46 +09:30
Zuhayr
840b5b756b Fixes #10358, #10359 and #10257 2015-08-01 23:17:27 +09:30
Zuhayr
2a51b778d6 Fixes #9611 2015-08-01 21:10:48 +09:30
Mloc
f04ca77bfb revert chargen rendering rework 
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-08-01 11:35:53 +01:00
GinjaNinja32
41a75e330a Holodeck fix 2015-08-01 09:39:29 +01:00
HarpyEagle
924d8fac74 Adds nightvision to cult constructs 2015-07-31 16:33:07 -04:00
mwerezak
b0434d90b2 Adds stealth rig sprites 
Adds sprites for the stealth rig, so that people don't mix it up with
the ninja. Helmet is different (based on swat mask and NVGs), everything
else is a copy of the ninja suit.
 2015-07-31 14:41:32 -04:00
mwerezak
1bfa4da870 Fixes #10315 
The cybersuit is no longer space-proof. In exchange, it has a few more
modules, built-in insulated gloves, and grippy shoes.
 2015-07-31 14:41:31 -04:00
Zuhayr
82152daa30 Merge pull request #10393 from Baystation12/dev-freeze 
Dev freeze
 2015-07-31 18:59:03 +09:30
PsiOmegaDelta
75920431e8 Merge pull request #10386 from mwerezak/antag-fix 
Fixes #10309
 2015-07-31 10:26:14 +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
c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00
PsiOmegaDelta
3c9dc10746 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2015-07-31 09:48:15 +02:00