cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,545 Commits 2 Branches 1 Tag
3b09c8b3a664120c1b3e57769f8266e7ac8ed88f
Commit Graph

9543 Commits

Author SHA1 Message Date
Zuhayr
ad47e954ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:19 -08:00
Zuhayr
e17038636f Added spiderbots! Adminspawn only currently. They take an occupied MMI or posibrain, can crawl through vents and hide, shock people, and go 'beep'. 2013-03-01 14:28:58 -08:00
Jim "Apples"
2064f57dc0 Merge pull request #2464 from caelaislinn/bleeding-edge-freeze 
added an admin proc to check for any inactive players with custom items
 2013-03-01 07:22:21 -08:00
Zuhayr
15984f6a14 Fix for posibrains, modification to posibrain brainmob for admin use, updated posibrain sprites, addition of spiderbot sprites for a later project. 2013-03-01 01:38:32 -08:00
Cael_Aislinn
30a34bbc9f added an admin proc to check for any inactive players with custom items 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 19:15:27 +10:00
Zuhayr
6569388d9f Map conflict, using bef. 2013-02-28 23:22:36 -08:00
Chinsky
b3ad6e989f Merge pull request #2454 from CIB/feature 
Department accounts are created now and credentials given to heads.
 2013-02-28 11:45:49 -08:00
Cael_Aislinn
533794b0db some useability tweaks to atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:45:33 +10:00
Cael_Aislinn
4633373d1f fixed an issue with database reconnection 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:23:22 +10:00
Cael_Aislinn
67a4a94896 atm fix mk 2 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:15:17 +10:00
Spamcat
c9e657a4c6 Reloading spent casings in the revolver doesn't duplicate "This one is spent" message 
Fixed #2434.
 2013-02-28 17:07:20 +04:00
Spamcat
9894ce73d5 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-28 13:48:44 +04:00
Spamcat
c4c31fd657 You can now switch off cameras. 
Fixes #2394.
 2013-02-28 13:46:56 +04:00
Gamerofthegame
a2cfc456c0 Removes Medical's random slowdown and faulty coding. 2013-02-27 22:07:30 -05:00
Gamerofthegame
f3ba4e4ec6 Opens the ERT debug-command preset for actual use. 2013-02-26 21:25:48 -05:00
Cael_Aislinn
43ebfd1fdd tweakfixes to finances 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-27 11:55:28 +10:00
cib
0876d6f913 Added extra safety check. 2013-02-27 02:48:49 +01:00
cib
26b4deb33f Department accounts are created now and credentials given to heads. 2013-02-27 01:55:18 +01:00
RavingManiac
e84d739fac Condensed capsaicin effects increased to pre-merge levels. 2013-02-26 12:58:44 +08:00
Christian Bielert
80b9257332 Merge pull request #2446 from Baystation12/BEF-staging 
Bef staging
 2013-02-25 09:58:25 -08:00
Chinsky
b143022084 Merge pull request #2445 from CIB/feature 
Fixed anti-depressants
 2013-02-25 09:44:18 -08:00
cib
19e176e2ff Fixed paroxetine. 2013-02-25 18:40:42 +01:00
cib
f2f2ce12ea Fixed citalopram. 2013-02-25 18:39:20 +01:00
Cael_Aislinn
cfa3916b95 new events (pda spam, trivial and mundane news items, lotto, hacker) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 03:02:24 +10:00
Cael_Aislinn
02ace92b04 miscellaneous tweaks to finance machines 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-26 02:59:04 +10:00
Chinsky
97b547d5d3 Merge pull request #2440 from Zuhayr/master 
Robot changes, Set Flavour verb.
 2013-02-25 01:19:08 -08:00
Zuhayr
36038d150c Returned Set Flavour Text to humans, added Set Pose and Set Flavour Text to robots. 2013-02-25 20:05:33 -08:00
Zuhayr
2381aa2dca Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain. 2013-02-25 19:48:00 -08:00
Cael_Aislinn
54fd829781 fixed chemical prep not working (runtime) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 15:06:40 +10:00
Cael_Aislinn
c1eda324b8 inserting cards into atms only wipes the screen if the card is for a different account, cleaned up dme 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:43:52 +10:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:27:44 +10:00
Cael_Aislinn
3fcab3bf19 more changelog, boosted max shield charge rate 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:21:32 +10:00
Cael_Aislinn
09dc10810f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-25 14:02:55 +10:00
Cael_Aislinn
5e99633c51 ordinary shield gens are now buildable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:50:46 +10:00
Cael_Aislinn
a101b51fa0 normal shield gens produce a ring of shields around the machine, renamed file, useability and simplification tweaks to shield gen + cap, fixed some random issues with shields 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:50:34 +10:00
Cael_Aislinn
fad9909b78 mice dont wander when asleep, they also snuffle (snore) occasionally 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:45:38 +10:00
Cael_Aislinn
fed198964f fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.> 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:45:13 +10:00
Cael_Aislinn
a77a409a78 tweaks to finances (added feedback to atms, made accounts synced to station account db at round start) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:44:35 +10:00
cib
721f15fb07 Fix issue #2433 
This should fix events not spawning.
 2013-02-24 20:39:36 +01:00
cib
975407edb4 Forgot antidepressants file. 2013-02-24 17:37:34 +01:00
Chinsky
83fdf57540 Merge branch 'feature' of https://github.com/CIB/Baystation12 into cibderp 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-02-24 20:29:59 +04:00
Chinsky
7bbb9e0be9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-24 20:17:51 +04:00
Cael_Aislinn
a7a0e48d67 compile fixes, tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-24 22:06:36 +10:00
Cael_Aislinn
6ec8669df6 Merge branch 'bleeding-edge-freeze' of github.com:caelaislinn/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm
	icons/obj/device.dmi
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-24 11:18:49 +10:00
Cael_Aislinn
5860b749ae tweaks to eftpos, re-applied mapchanges (eftpos scanners placed in civilian departments, atms placed in main hallways, account databases placed) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-24 11:16:43 +10:00
Cael_Aislinn
b36a9565a6 bumped turret noise prob 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 22:21:35 +10:00
Cael_Aislinn
a8c2745398 cut back cached music to 2 tracks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 22:10:53 +10:00
Cael_Aislinn
3cc31685c0 fixed round start/late arrival account creation for players, made eftpos scanners orderable via QM 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 21:51:56 +10:00
Cael_Aislinn
ec023cc3f8 tweaks to finances (inc boost to wallet capacity, new sprite for eftpos) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 21:51:29 +10:00