Commit Graph

408 Commits

Author SHA1 Message Date
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
Belsima
87f98d3b24 Replaces status frame sprite. 2017-08-15 23:49:34 -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
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
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
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
Yoshax
eeed8496cf Fixes the paperwork date insert 2017-03-05 03:10:11 +00: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
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
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
Datraen
d69f9557ce Make cameras great again 2016-11-17 10:42:52 -05: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
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Spades
9c78d6a2a1 Naming inconsistencies fixed
The short naming of central command has been really inconsistent across
the game's files. This has always annoyed the shit out of me.

CentComm and Centcomm and Centcom are now all CentCom, specifically with
that capitalization. Why one M instead of two M's? Because Comm with two
'M's = Communications. Hence, Telecomms, NOT Telecoms. Telecoms is
incorrect. CentCom was also chosen because CentCom with one M and this
casing is most found throughout the game's files.

Speaking of Telecomms, I corrected one instance in the game where it's
Telecom. Like I said, this is not correct. There was only one
inconsistency.

Likewise, Nanotrasen has been changed to NanoTrasen. Nanotrasen only
appears 20 times, where NanoTrasen appears 62. NanoTrasen is clearly the
preferred, correct naming.
2016-09-13 16:36:43 -04:00
Yoshax
f7c459d796 Merge pull request #2357 from SinTwo/framecleanup2
Frame Cleanup + Machinery Code Cleanup
2016-08-28 18:31:16 +01:00
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
SinTwo
fa92cdeeda Merge branch 'master' of https://github.com/PolarisSS13/Polaris into framecleanup2 2016-08-23 18:33:51 -04:00
SinTwo
eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
2016-08-15 12:58:00 -04:00
SinTwo
6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	code/modules/admin/holder2.dm
2016-08-15 12:26:53 -04:00
SinTwo
045c393683 Revert "Revert "Frame Cleanup""
This reverts commit 82722ba42f.
2016-08-13 19:55:57 -04:00
NullSnapshot
06ddbfc98d gets rid of unneeded code in adminpaper
minor change to paper.dm fixes the issue adminpaper needed the code in.
2016-08-12 21:58:15 +01:00
Yoshax
de38b055b4 Adds ability to put the SolGov logo on the admin faxes 2016-08-12 21:58:08 +01:00
NullSnapshot
e987e2f0c4 allows check_rights to accept either mobs or clients. 2016-08-12 21:48:52 +01:00
NullSnapshot
3345ac5cd1 gets rid of some text macros. 2016-08-12 21:36:17 +01:00
NullSnapshot
d81bfe3c3e adds footer and changes fax challenge to an md5 of the game ID. 2016-08-12 20:07:15 +01:00
NullSnapshot
e881c77c8f refactors admin faxes to allow for more simple to use fax creation and replying.
Admins also gain the ability to initiate faxes.
And mods can send and receive faxes now.
2016-08-12 19:58:52 +01:00
SinTwo
f50adb9554 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	code/_helpers/time.dm
	code/modules/economy/ATM.dm
2016-08-09 15:46:24 -04:00
Yoshax
82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
Yoshax
afa7878abb Merge pull request #2263 from SinTwo/frame_cleanup
Frame Cleanup
2016-08-05 21:14:35 +01:00
SinTwo
07b4eb2d95 final fixes, tweaks, and cleanups 2016-08-03 14:09:12 -04:00
SinTwo
4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
SinTwo
0086d61d56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	code/modules/client/client procs.dm
	nano/templates/robot_control.tmpl
2016-07-27 16:11:55 -04:00
SinTwo
66c3a007a9 frame cleanup fixes 2016-07-23 23:45:24 -04:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state
Item State Cleanup
2016-07-23 15:53:36 -05:00
Peter Mörck
88c82dfe65 New stamps for warden and cargo.
Add new stamps for warden and cargo.
Replace the stamps in their areas to the corresponding new ones.
Give captain a deny stamp.
2016-07-23 15:42:08 +01:00
SinTwo
4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2016-07-22 23:39:19 -04:00
redstryker
2e25267791 Adds SolGov logo to Paperwork and SolGov Stamps 2016-07-21 15:29:08 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
SinTwo
fbfa773f56 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	nano/css/icons.css
	nano/css/shared.css
2016-06-25 19:58:21 -04:00
SinTwo
4fa126b7e7 a whole lot of nanoui upgrades 2016-06-24 00:43:16 -04:00