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
21,485 Commits 2 Branches 1 Tag
ae8829cabec63fa5a2b72b8d1a839dd92f33aeb0
Commit Graph

9434 Commits

Author SHA1 Message Date
Amunak
b2c266ff93 More research console GUI formatting. 
Also simplified the <LI>st definitions.
 2014-12-14 05:18:43 +01:00
Amunak
6bf59253fd Fixes wrong shield design path 2014-12-14 05:16:49 +01:00
Amunak
b84cc64027 Removes duplicate shield research definitions. 
They were moved to the common designs file by a previous commit.
 2014-12-14 05:05:55 +01:00
Amunak
b7e7d08599 Fixes destructive analyzer name. Removed oldcode. 2014-12-14 05:05:09 +01:00
Amunak
158573f066 Corrects names of computers, code formatting, updated computer descriptions. 
Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board.
 2014-12-14 05:00:38 +01:00
Amunak
429a898e72 Fixes a bug that made bubble shield gen unconstructable 2014-12-14 04:56:23 +01:00
Amunak
8961ee9014 Refactoring designs.dm. 
They now use a better system of assigning names and descriptions. Removes the need to copypaste most of the lines. For now only computer boards were changed. Also attempt to do proper capitalization.
 2014-12-13 07:43:46 +01:00
Amunak
b60e9eedbe Added detailed research information to R&D console 
It lists 'desc' of each researched and 'buildable' datum/design, which was a previously unobtainable information. And it's all-access (just like technology level listing).
 2014-12-13 07:08:39 +01:00
Amunak
6e15257df9 R&D console refactor, formatting and output format improvements 2014-12-13 07:06:42 +01:00
Amunak
6419f3426e Destructor now asks for confirmation using alert instead of list 2014-12-13 07:02:54 +01:00
Amunak
94a93ac97d Reverted accidental changes to SMES building and RCON research 2014-12-11 11:27:01 +01:00
Amunak
1e769b4314 Attempt to normalize computer and circuit board names and their research names. 
Also moved RCON console board and SMES board where they belong. Formatted some board code and fixed some typos, too.

Cloning console renamed to Cloning Control Console.
The teleporter console is now called Teleporter Control Console.
The power monitor is now called Power Monitoring Console.
SMES board glass and acid construction price normalized (though other resources are still required; is that a good thing? It would be better to just introduce a new expensive part that is used to build it (if the coils aren't enough) rather than have a single board with atypical price.
 2014-12-10 20:37:18 +01:00
PsiOmegaDelta
1327808386 Merge pull request #7275 from atlantiscze/substation-features 
RCON System
 2014-12-10 11:45:32 +01:00
Zuhayr
a3dc661c62 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-12-10 18:50:31 +10:30
Zuhayr
5730bcb885 Merged master/dev config.txt. 2014-12-10 16:35:39 +10:30
ccomp5950
3414e48ceb Adds "paranoid" option to remove more powerful debug options from R_DEBUG. 
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
    Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid

    The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
 2014-12-09 21:25:07 -05:00
Atlantiscze
389b12091d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features 2014-12-09 20:48:56 +01:00
PsiOmega
52e6f96dc7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-09 17:55:14 +01:00
Zuhayr
53627175ef Merge pull request #7347 from Baystation12/master 
Updating dev-freeze from master.
 2014-12-10 03:21:56 +10:30
Ccomp5950
cab064cd16 Merge pull request #7340 from Zuhayr/dev-freeze 
Dev-freeze fixes.
 2014-12-09 11:48:33 -05:00
Zuhayr
4aa7c072ca Merge pull request #7337 from Loganbacca/glassesfix 
Science goggles overlay fix
 2014-12-10 03:11:18 +10:30
PsiOmegaDelta
41cca1b250 Merge pull request #7303 from TwistedAkai/dev 
Implements existing assistant alternate job titles
 2014-12-09 17:34:31 +01:00
Zuhayr
39f303c50e Actually fixes hardsuit back icons. 2014-12-10 02:37:23 +10:30
Zuhayr
fea8868753 Fixes #7310 and should also fix #7311 2014-12-10 02:28:03 +10:30
Zuhayr
e80f59742d Fixes #7316 2014-12-10 00:56:26 +10:30
Zuhayr
bc394b72d6 Fixes diona and simple_animals eating snacks. 2014-12-09 22:14:41 +10:30
Segrain
4ae3d3029f Fix for #6643. 2014-12-09 14:54:20 +03:00
Segrain
065d9b110c Fix for #6476. 2014-12-09 14:52:43 +03:00
PsiOmegaDelta
63a5d009c7 Merge pull request #7267 from GinjaNinja32/noise 
Audible emote improvement, adds ability to emote over radio.
 2014-12-09 11:54:57 +01:00
Zuhayr
7bc72fb836 Tidied up/fixed up the rig back icons. 2014-12-09 21:01:17 +10:30
Zuhayr
ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Loganbacca
2b98f70f9f Science goggles overlay fix 2014-12-09 22:05:14 +13:00
PsiOmega
48aeefa85a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm
 2014-12-09 09:42:14 +01:00
PsiOmega
924955a4c8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-12-09 09:07:38 +01:00
Segrain
4b7b910311 Fix for #7324. 2014-12-09 09:39:05 +03:00
PsiOmegaDelta
f9e59d430b Merge pull request #7329 from mwerezak/talisman 
Adds image for cult talismans
 2014-12-09 07:26:10 +01:00
mwerezak
81890c968e Adds image for cult talismans 
So they aren't blank when examined.
 2014-12-08 20:45:15 -05:00
Ccomp5950
d8fb78b711 Merge pull request #7326 from Raptor1628/dev-freeze 
Hardsuit Fixes
 2014-12-08 20:43:56 -05:00
Ccomp5950
628f040f00 Merge pull request #7318 from sabiram/patch-1 
Potentially fixes white sundress
 2014-12-08 20:43:25 -05:00
Ccomp5950
4d615fc294 Merge pull request #7271 from Segrain/dev-freeze 
Dev-freeze fixes.
 2014-12-08 20:40:02 -05:00
Raptor1628
921249a335 Hardsuit Fixes 
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
 2014-12-08 19:12:39 -05:00
sabiram
b27adda1c3 Potentially fixes white sundress 2014-12-08 14:30:03 -05:00
PsiOmega
445dba869d Merge branch 'dev-freeze' into dev 2014-12-08 17:38:13 +01:00
Akai Alonkai
268ec0d36a Implements existing assistant alternate job titles 
Adds an option to choose one of the alternate job titles for assistant
already defined at
https://github.com/Baystation12/Baystation12/blob/master/code/game/jobs/job/assistant.dm#L12
 2014-12-08 11:12:30 -05:00
GinjaNinja32
439cbd6255 Properly merge stuff 2014-12-08 15:36:49 +00:00
GinjaNinja32
681a6d21ea Merge remote-tracking branch 'upstream/dev' into ! 
Conflicts:
	code/modules/mob/hear_say.dm
 2014-12-08 15:32:49 +00:00
Atlantiscze
7754fda105 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features 2014-12-08 06:58:50 +01:00
Atlantiscze
2016d92358 RCON Console Construction 
- RCON consoles can now be built. They require quite high end circuit board from research, however.
 2014-12-08 06:58:10 +01:00
PsiOmegaDelta
19b359f4eb Merge pull request #7268 from GinjaNinja32/playerpanel_lang 
Allow forcesay with no client, add language toggles to player panel
 2014-12-08 06:45:38 +01:00
PsiOmegaDelta
e66f5ed765 Merge pull request #7272 from Raptor1628/dev-freeze 
Hardsuit Mark Two, more Hulabaloo
 2014-12-08 06:45:11 +01:00