cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 13:33:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 2 Branches 1 Tag
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

66 Commits

Author SHA1 Message Date
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
PsiOmega
e722da01f6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-09-12 13:10:29 +02:00
PsiOmega
834d93df00 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-12 12:51:22 +02:00
SomeoneElse
7e4191d212 [minor] Fix ATM transfer code, remove badly placed 'break'. 
code/modules/economy/Accounts.dm:
	remove break from charge_to_account()
 2015-09-11 16:44:00 +06:00
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
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
PsiOmegaDelta
4bb6749f24 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-11 08:34:46 +02:00
PsiOmegaDelta
e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
 2015-08-11 08:21:06 +02:00
PsiOmega
e0525bec35 Fixes #10447. 
Corrects Icarus' designation.
 2015-08-09 12:21:52 +02:00
PsiOmegaDelta
8b731feb8b Economic strength now depends on race and job. 
The amount of money a crew member can start with is now affected by race and species.
Also fixes #8546.
 2015-07-02 20:14:35 +02:00
PsiOmegaDelta
405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
 2015-06-20 20:40:06 +02:00
Zuhayr
56b68b9abe Fixes #9847 2015-06-20 22:15:38 +09:30
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmegaDelta
6c903907c0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-04 08:10:49 +02:00
GinjaNinja32
5a2933bb4f Fixes #9645 2015-06-02 20:39:03 +01:00
PsiOmega
be91976e30 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-09 11:13:05 +02:00
PsiOmega
72dc583ef5 Fixes #9139. 
Arranges the order at which starting funds is set and account creation is done.
 2015-05-07 19:23:56 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmega
71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
RavingManiac
6482dfb374 EFTPOS scanners now work with IDs in PDAs and wallets 
Vending machine code revised slightly

"\the" added to visible messages where applicable
 2015-04-07 22:09:11 +10:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
volas
5fee41d4ba sanitize() refactor: third pass (misc) 2015-03-25 01:05:21 +03:00
Zuhayr
64b33c43db Refactors some job variables from the Economy file (what the fuck) and swaps created types for lists in bot access assignment. 2015-02-28 20:20:19 +10:30
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca
bc57c8b55d Made thaler bundle merging code more sane 
Both bundles are dropped, then the merged one is put in the users hands
 2015-01-11 21:44:12 +13:00
PsiOmega
f5602de811 Fixes #7427. 
Station funds can no longer go into the negative from creating a new account.
Limits how much/little money a single account is allowed.
 2014-12-12 15:43:29 +01:00
PsiOmega
23bb747364 Merge remote-tracking branch 'upstream/master' into dev 2014-11-26 22:10:09 +01:00
GinjaNinja32
a543d557b9 Fix sub-1 thaler piles being invisible, disallow subdivision below 0.01 2014-11-24 18:56:41 +00:00
GinjaNinja32
20779aac33 Fix ultra-rich people crashing the server 2014-11-24 18:11:09 +00:00
PsiOmega
7bb5b51954 Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event 
Conflicts:
	code/modules/events/event_manager.dm
 2014-11-12 10:18:45 +01:00
PsiOmega
bd885164f1 Merge remote-tracking branch 'upstream/dev' into TheGreatEvents 
Conflicts:
	code/global.dm
 2014-11-08 10:26:45 +01:00
PsiOmega
77c52f48a8 Newscaster and photo cleanup 
Synthetics can no longer magically print color images on a black-and-white photocopier.
No longer possible for organics to acquire a synth-image by un-attaching it from a newscaster.
News articles now come with a timestamp and photo captions, if anything was penned on an attached photo.
Reception-checks no longer unconditionally sleeps the thread. Was causing havoc with NanoUI.

Misc. code refactoring.
 2014-11-06 13:28:17 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega
ff14da90b3 Random Event Overhaul 
Alters the event controller based on http://baystation12.net/forums/viewtopic.php?f=5&t=10706.
Exception is that there is always some start time variance to prevent metagaming.

Mundane, moderate, and major events run on their own timers and start and run independantly of each other.
Multiple events of the same severity degree can run at the same time. However, currently only one instance of the same event can be active at a time.
 2014-11-03 09:22:37 +01:00
PsiOmega
9c41148a08 PDA newscaster 
One can one access and view newsfeeds from the comfort of one's PDA.
Possible to change and disable the newsmessage beep.

Known issues:
Unlike browse() NanoUI does not appear to wait for browse_rsc(), the method which to transfers image to the client's cache, to finish.
This often results in newsfeeds not always displaying their images the first time they are viewed.
 2014-10-28 17:10:35 +01:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
00871b5207 Fixes #6724 2014-10-16 14:47:09 +10:30
Hubblenaut
c783549015 Option to withdraw chargecard or cash at ATM 2014-09-28 21:53:19 +02:00
Hubblenaut
e7620cd81a Spacecash is now stackable and called 'Thalers' 2014-09-28 21:52:56 +02:00
PsiOmega
68bf885e6b Announcement system refactoring. 
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast

Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.

Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
 2014-08-21 06:34:41 +02:00
Zuhayr
5da36d265e Merge resolution with PDA nanoui. 2014-07-25 22:57:53 +09:30
Hubblenaut
2151e279cc Fixes Runtime Error, doesn't query for PIN on lowest account security level 2014-07-21 12:08:50 +02:00
Mark Aherne
7e7e6cd8ac Continued work in progress on a major revision of the NanoUI templating system. 2014-07-11 10:48:42 +01:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Hubblenaut
a522cf9399 Fixes runtime error when copying the stamped EFTPOS paper 2014-06-06 20:45:39 +02:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny 
Mutiny Mode
 2014-05-28 00:13:42 -05:00
Ravensdale
abdadd35b4 Updates most used viable entries of t cet to Nyx 2014-05-26 15:58:16 -07:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
igalan
7e8ff266a1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ewallet 
Conflicts:
	icons/obj/items.dmi
 2014-04-21 06:07:02 +01:00
igalan
fdb3d55483 -Printable transaction logs. 2014-04-18 05:42:25 +01:00