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
15,890 Commits 2 Branches 1 Tag
810de4ddaa57a2b51a302037382e34c8eb80362a
Commit Graph

3145 Commits

Author SHA1 Message Date
Ccomp5950
975433f898 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi
 2014-01-30 12:14:44 -06:00
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
7a36d1c9bc Fixes #4346 2014-01-30 21:30:58 +10:30
Kilakk
44962760b8 Removed pointless output 
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
 2014-01-24 15:04:41 -05:00
Kilakk
1a7616fb35 Fixes #4322 
* There's probably a much more "modular" way of doing this, but, eh
 2014-01-23 20:53:05 -05:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-23 00:05:53 -06:00
Loganbacca
682dfd5670 More typo fixes 
Missed these in the last commit.
 2014-01-15 20:03:12 +13:00
Loganbacca
c83537a6a9 Sink filling typo 
No more filling the the bucket using the sink.
 2014-01-15 19:13:06 +13:00
Ccomp5950
d5bcef4f8a Uplink fix item spawner fix. 
Probably a merge conflict fix or something but some code got moved to an odd spot.
 2014-01-12 22:37:00 -06:00
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Ccomp5950
167671d583 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.
 2014-01-11 20:09:11 -06:00
Loganbacca
909928f3f9 Plasma glass stacking fix 2014-01-11 18:14:51 +13:00
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears 
Tiny objects on ears
 2014-01-10 13:47:10 -08:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
RKF45
16cc421e34 Tiny objects on ears 2014-01-09 23:45:08 +01:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes 
Lots of bugfixes.
 2014-01-09 02:47:20 -08:00
SkyMarshal
d43b2fa492 RCDs no longer create plating with air on it. 
Fixes #3545
 2014-01-08 17:50:59 -07:00
Mloc-Argent
c337e5e5f3 More elegant solution to dirt getting in the way. 
Who needs to click dirt anyway?

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-08 21:34:15 +00:00
Mloc-Argent
be153d14a3 Fixes for the tg cherrypicks. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-08 20:32:35 +00:00
Kyrah Abattoir
f91b44b47f correct paint can names and plural status, corrected pill box names, corrected lockbox names. 2014-01-08 19:56:03 +00:00
Kyrah Abattoir
98f02be5a6 code/game/object/items/weapons/* lowercase pass 
code/game/object/structure/* lowercase pass (start)

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/game/objects/items/weapons/paint.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/vending_items.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/structures/bedsheet_bin.dm
	code/game/objects/structures/door_assembly.dm
 2014-01-08 19:56:00 +00:00
Kyrah Abattoir
7315b75cca FIXED: inconsistencies with stack item names. 
CHANGE: stacks are gender = PLURAL by default because it fits.

Conflicts:
	code/game/objects/items/stacks/stack.dm
 2014-01-08 19:48:43 +00:00
Kyrah Abattoir
2f0a0243e9 code/game/objects/items/robot/* lowercase pass 
NOTE: vision modes have to be proper.

Conflicts:
	code/game/objects/items/robot/robot_parts.dm
	code/game/objects/items/robot/robot_upgrades.dm
 2014-01-08 19:47:48 +00:00
Razharas
691e15bb2f Fixes chameleon projector 
Conflicts:
	code/game/objects/items/devices/chameleonproj.dm
 2014-01-08 19:43:27 +00:00
Razharas
3b66f33d14 Fixes morgue trays used by ghosts and what not 2014-01-08 19:39:20 +00:00
Cluwnes Honk
2069a9e83c Personnelly, I feel this pull request was successfull. 
Spelling fixes.

Conflicts:
	code/game/machinery/newscaster.dm
 2014-01-08 19:26:10 +00:00
ChuckTheSheep
533600eaa5 Explosion Optimizations 
Implements a trange that internally checks only turfs and thus less
intensive.

Conflicts:
	code/game/objects/explosion.dm
 2014-01-08 19:21:47 +00:00
Mloc
794be2b31e Fix previous commit for BS12. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-08 11:49:15 +00:00
YotaXP
68ae21fac3 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm
 2014-01-08 11:41:51 +00:00
Ccomp5950
02d8093daa PDA NanoUI Optimizations. 
Since we no longer have to send data on first UI view we can remove those
checks and only look at the data we need to send when we need to send it.

Also fixed a couple of the links on the status display function.
 2014-01-08 02:20:14 -06:00
Zuhayr
1faf2ef25b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-08 09:42:47 +10:30
Ccomp5950
1575db6320 Fixed placing ID's into PDA's that are on the ground. 
Removed useless can_use check, no reason that is needed there.
 2014-01-06 23:33:48 -06:00
Mark Aherne (Faerdan)
f25052fd4c NanoUI updates. 
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).
 2014-01-06 02:49:25 +00:00
Ccomp5950
c8beb39944 Dirt Fixes. Pass ALL the attack_by's to the floor. 2014-01-05 19:17:26 -06:00
Mark Aherne (Faerdan)
909c873b2e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-05 02:48:44 +00:00
Mark Aherne (Faerdan)
6d9368d949 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs 
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.
 2014-01-05 02:48:15 +00:00
Ccomp5950
ad740b9397 Merge pull request #4198 from Zuhayr/dev 
Diona nymphs are now wearable.
 2014-01-03 19:33:54 -08:00
Mark Aherne (Faerdan)
c1ed93cf29 The new NanoUI PDA will now update automatically, eliminating the need for a Refresh button. 
When a user sends or recieves a Message using a PDA, the UI (if open) will now update instantly to show the sent/received message (this uses the new nanomanager.update_user_uis proc).
 2014-01-04 02:12:18 +00:00
Zuhayr
62893f80b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-04 11:35:07 +10:30
Ccomp5950
f0563911cb Fingerprints on showers and crayon graffiti. 
fixes #4076
as well as admin request on crayons.
 2014-01-02 20:26:14 -06:00
DJSnapshot
2949c2f675 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-02 16:56:38 -08:00
Zuhayr
2c492d8289 Using DNA2 files from master. 2014-01-03 11:19:40 +10:30
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Chinsky
2cf4a9279c Merge pull request #4157 from Ccomp5950/cleanbot_fix 
Bugfix:  Actually implement cleanbot targeting.
 2013-12-31 17:33:14 -08:00
Zuhayr
56c967c250 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-12-31 21:24:03 +10:30
Ccomp5950
645710cb0b Bugfix: Actually implement cleanbot targeting. 
Cleanbots won't attempt to clean up the same mess.

Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.

It was creating a blank list and then checking that list to see if anything else had
that mess targeted.  Removed the blank list check and added an actual check.
 2013-12-30 21:59:20 -06:00
Zuhayr
25f7db1949 Fix for unremovable dirty tiles. 2013-12-31 11:32:36 +10:30
DJSnapshot
7a7eca4393 Merge pull request #4146 from Baystation12/dev-freeze 
Dev-freeze --> Master staging [Going live!]
 2013-12-30 13:52:21 -08:00