Commit Graph

23653 Commits

Author SHA1 Message Date
Cameron653
995ae56dfe Makes pierce damage correctly heal when bandaged 2016-08-15 20:39:55 -04:00
Neerti
9177ab31cc Merge pull request #2327 from SinTwo/bugfixbugaloo
Fixes
2016-08-15 18:19:05 -04:00
Neerti
a800fa33d5 Merge pull request #2329 from Yoshax/englishlist
Rewrite english_list to be a little nicer on lists of objects, and also faster
2016-08-15 18:18:48 -04:00
Neerti
3e1a186569 Merge pull request #2328 from Yoshax/hardsuitexamine
Lists installed hardsuit modules when examining
2016-08-15 18:18:16 -04:00
Neerti
988094d838 Merge pull request #2323 from Yoshax/IDears
Actually allows IDs to be put ~~in~~ on your ears
2016-08-15 18:05:59 -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
Yoshax
e395e7374d replace pointless english_list call with jointext 2016-08-15 17:33:36 +01:00
GinjaNinja32
12bc3aa0ff Rewrite english_list to be a little nicer on lists of objects, and also faster 2016-08-15 17:31:10 +01: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
Kasuobes
6c6ff63747 Squished list of isntalled modules if any
It looks prettier! :D Also won't spam the chat log as much if someone has a dozen modules installed.
2016-08-15 17:25:19 +01:00
Kasuobes
557728baa9 Lists installed hardsuit modules when examining
Similar to how examining mechs will list all the installed equipment, RIGs will now list all installed modules if the panel is open, while the RIG is being held or worn.
2016-08-15 17:25:11 +01:00
SinTwo
fcea10c106 Fixes #2092 2016-08-15 11:33:41 -04:00
SinTwo
265eaba34f Fixes #2122 2016-08-15 11:25:00 -04:00
SinTwo
0b96487e0d Fixes #2012 2016-08-15 10:46:26 -04:00
SinTwo
ae0fbd52c2 Fixes #1620 2016-08-15 10:45:13 -04:00
SinTwo
cba8cdcde8 Fixes #2036 2016-08-15 10:38:32 -04:00
SinTwo
8a5e045921 Fixes #2302 2016-08-15 10:33:53 -04:00
EmperorJon
f6a83d5ee0 Merge pull request #2326 from Hubblenaut/bottle
Bottles will now sell for their set prices.
2016-08-15 14:46:26 +01:00
Hubblenaut
10391e5f3b Bottles will now sell for their set prices. 2016-08-15 15:32:28 +02:00
Yoshax
d206f0d80d Actually allows IDs to be put ~~in~~ on your ears 2016-08-15 13:58:42 +01:00
Yoshax
c26f9ed68b Fixes everyone and their dad having QM access 2016-08-15 13:45:36 +01:00
EmperorJon
f6a7d068d5 Merge pull request #2314 from Anewbe/taj_cleanup
Taj cleanup
2016-08-15 11:32:05 +01:00
EmperorJon
2810683110 Merge pull request #2319 from ColaFiend/master
Minor text fixes.
2016-08-15 10:04:08 +01:00
ColaFiend
50a93f98b1 Update floor.dm 2016-08-15 09:52:38 +01:00
EmperorJon
4a11ea2283 Merge pull request #2308 from Hubblenaut/master
Adds a verb for toggling specific pieces of underwear
2016-08-15 09:50:26 +01:00
Brightdawn~
b5eec907c0 Minor text fixes.
Changes description of rainbow shoes.

Adds description for:
Potted Plant
Plating
2016-08-15 06:31:42 +01:00
SinTwo
9e4d4752ac cleanup 2016-08-14 20:46:04 -04:00
Neerti
32fcb9f6ee Merge pull request #2317 from Anewbe/access_tweaks
Removes Chaplain morgue access
2016-08-14 14:24:48 -04:00
Anewbe
0b9a0691d3 Removes Chaplain morgue access 2016-08-14 12:13:20 -05:00
Yoshax
02c11fe87f Updates the valid species list to have all species 2016-08-14 17:24:58 +01:00
Yoshax
5426efcb39 Fixes valid_species having datums 2016-08-14 17:14:26 +01:00
PsiOmegaDelta
de6d2a4a31 Fixes check_rights runtiming for non-holders.
Fixes all kinds of errors.
2016-08-14 16:10:39 +01:00
Yoshax
cfaada473b Fixes change appearance not working for other species 2016-08-14 16:10:07 +01:00
Anewbe
aa81925b71 Adds Changelog 2016-08-13 23:18:51 -05:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
Neerti
4e37d71657 Merge pull request #2291 from Kelenius/botAccess
Roboticists now can access bots.
2016-08-13 20:24:35 -04:00
Anewbe
3870349d35 Merge pull request #2309 from Yoshax/paperwork
Refactor of admin fax handling
2016-08-13 19:22:47 -05:00
Yoshax
b2ba310df0 Fixes dirt 2016-08-13 15:30:20 +01:00
Neerti
730b6c58da Merge pull request #2154 from Yoshax/secretisdumbasshit
Makes secret not bad
2016-08-12 17:15:14 -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
Hubblenaut
2c92802db5 Adds a verb for toggling specific pieces of underwear 2016-08-12 20:58:40 +02:00
Yoshax
2163998e2f Fixes #2303 2016-08-12 03:07:16 +01:00
Yoshax
e4dc0f2209 Fixes #2050 2016-08-11 22:18:10 +01:00
Yoshax
b72410cdef Fixes #2254 2016-08-11 22:04:57 +01:00
Yoshax
733450f46b Fixes #2271 2016-08-10 23:48:02 +01:00