Commit Graph

447 Commits

Author SHA1 Message Date
Arokha Sieyes
2b8063418a Merge pull request #2758 from VOREStation/aro-updateicons
3000% human/update_icons() speed improvement
2018-01-16 02:44:30 -05:00
Arokha Sieyes
10aabd98da POLARIS: 3000% human/update_icons() improvement
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
Leshana
83562acf66 POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays. 2018-01-14 23:00:10 -05:00
Arokha Sieyes
ad74dec1c0 POLARIS: Planes shenanigans. Begins 'plane' work. 2018-01-14 00:39:59 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Belsima
3320690a1e I before E (#4287)
* except after C

* maroonic mistake

* Improved use of sound files.

Also more grammar.

* now with less fuckup
2017-11-19 03:00:14 -06:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
Anewbe
97169dc5b7 Parapen nerfs 2017-11-06 02:02:14 -06:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Ansari
e4443d5686 Squashed commits together. Better desc for plane 2017-10-27 08:42:51 +08:00
Yoshax
d58293749e Reverts Ace's changes to make parapens functional 2017-10-21 17:50:07 +01:00
killer653
1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe
3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05:00
Anewbe
ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05:00
killer653
bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Neerti
8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2 work 2017-09-04 21:52:47 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Belsima
87f98d3b24 Replaces status frame sprite. 2017-08-15 23:49:34 -04:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Cameron653
97957fcaee Replaces more macros. (#3647)
* MORE MACRO CHANGES

AHHHHHHHHHHHHHHHHHHHH

* Fixes a few typos

* Fixes compile error

* Fixes for real

* 4 macros left that I can't find
2017-07-27 21:12:21 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Belsima
1d7cea9864 renames a mislabelled pen 2017-07-10 18:07:07 -04:00
Belsima
b7a34a3645 Adds a gilded pen. 2017-07-10 18:01:43 -04:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Leshana
44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Leshana
379ac4c63d Fix Runtimes
click.dm fixes:
[09:46:49] Runtime in unsorted.dm,1293: list index out of bounds
  proc name: screen loc2turf (/proc/screen_loc2turf)
[09:46:49] Runtime in click.dm,345: Cannot execute null.Click().
  proc name: Click (/obj/screen/click_catcher/Click)
paper_bundle.dm fixes:
[10:30:21] Runtime in paper_bundle.dm,183: Cannot read null.loc
  proc name: Topic (/obj/item/weapon/paper_bundle/Topic)
human.dm fixes:
12:27:51] Runtime in human.dm,1476: Cannot read null.name
  proc name: Toggle Underwear (/mob/living/carbon/human/verb/toggle_underwear)
2017-03-30 21:20:31 -04:00
Arokha Sieyes
4c0e330140 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync 2017-03-11 18:47:17 -05:00
Anewbe
9141314d60 Merge pull request #3060 from nachomeep/sounds
Enables photocopier sounds
2017-03-08 10:53:09 -06:00
nachomeep
59a592fd34 minor delay adjustment 2017-03-07 16:13:19 -05:00
nachomeep
eaba140555 adds delay to sounds 2017-03-07 16:11:38 -05:00
nachomeep
72d54925d5 enables photocopier sounds 2017-03-07 15:16:57 -05:00
Leshana
f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Yoshax
eeed8496cf Fixes the paperwork date insert 2017-03-05 03:10:11 +00:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Leshana
3781494933 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-23 18:25:37 -05:00
Leshana
dbd3622588 Enhances the Paper Shredder
* Makes the paper shredder constructable and deconstructable.
* Switches to some new sprites which are animated!
* Machine now requires power, icons respond to power on/off etc.
2017-02-21 19:21:32 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Leshana
283b58e93d Fixes dragging clothing with storage onto an occupied hand
* If you mouse-drag certain items onto a hand which is already holding something, the item goes into limbo.
* The reason this happens is that the standard code handling drags is directly calling usr.u_equip, despite the comment on that proc clearly saying never to do that.  So it just throws it to limbo and the next line attempting to put it in hand does nothing becuase the hand is occupied.   Better way is to call unEquip, so the item will drop on the ground if it fails.
* Fixes https://github.com/VOREStation/VOREStation/issues/394
2017-02-09 14:49:13 -05:00
Leshana
4b5615ad69 Fixes Issue #2982 - Deconstruction of Fax Machine
* Fax machine's New() was not calling `..()` and therefore `circuit` was not being changed from a type to an instance.  Thus when deconstruct proc tries to read it's properties it can't.
* A search thru code found the aifixer had the same problem. Fixed it there too.
2017-02-04 17:34:03 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
Datraen
d69f9557ce Make cameras great again 2016-11-17 10:42:52 -05:00
Leshana
6b26f620c2 Add discord integration for faxes
* Transmit a message to a webhook that sends a message to discord when an admin fax is sent.
* Its not feasible to send the text of the fax (considering it might be just a picture!) to discord, so instead we export it to a file, and discord links back to it.
* Obviously to fully work this also requires a webhook script and webhosting of the faxes folder.
2016-11-04 21:58:25 -04:00
Leshana
8710e0f926 Fix faxes color coding by destination actually working.
* This was probalby once a switch and broken by whoever put in the boss_name thing.  But yeah, obviously this code won't work as is, so lets fix it.
2016-11-04 21:58:25 -04:00
Arokha Sieyes
d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.
2016-11-04 15:42:32 -04:00
Spades
d16ed00228 Fixes Sol Gov and CentCom stamp names
This was irritating me.

- "solgov stamp" is now "Sol Government rubber stamp"
- "centcomm rubber stamp" is now "CentCom rubber stamp"
2016-10-23 15:39:42 -04:00