Heroman
cb9a30cb9f
Comma
2020-10-14 18:43:04 +10:00
Heroman
99b4eab1d1
Added Orderly
2020-10-14 18:42:42 +10:00
Killian
99d65dd8a4
Merge remote-tracking branch 'upstream/master' into kk-ships
2020-10-10 17:43:35 +01:00
KasparoVy
880f014d7c
Fixes Only One Accessory Equipped at Spawn & in Character Preview
...
Ported from Aurora PR#10205, credit to fernerr
Now you can see all the accessories (within standard equipping logic) you've selected in the character preview.
Addditionally, these accessories will now all be equipped when you spawn instead of filling your backpack unless it's actually necessary.
2020-10-08 18:15:17 -04:00
Killian
0d11071c8a
salamander trader
2020-10-07 03:53:44 +01:00
Amaya
6cb7a5c479
adds 10 flora structures.
2020-10-01 16:55:54 +02:00
Heroman3003
c9cc27afdd
Conmflict Resomnlution
2020-10-01 06:15:30 +10:00
Heroman3003
ee0c03eba1
Merge branch 'master' into great-alt-titling
2020-10-01 06:14:01 +10:00
Runa Dacino
61e6324dbf
Lowered from 6 to 5. I skimmed over pilot, and saw a six.
2020-09-30 21:08:57 +02:00
Runa Dacino
a65a448c07
Increases off-duty pay to match department lowest.
2020-09-30 20:58:58 +02:00
Runa Dacino
890ad97655
Gives off-duty explorers payraise.
2020-09-30 20:58:09 +02:00
Heroman
8de60524dd
Removes redundant alt-titles from offduty too
2020-10-01 04:43:47 +10:00
Killian
a639f767c9
talon cleanup/tweaks
2020-09-29 16:47:48 +01:00
ShadowLarkens
4b4da30c40
TGUI Character Directory
2020-09-28 22:55:50 -07:00
David Winters
b6ac68836a
please work PLEASE
2020-09-29 00:28:25 -04:00
Heroman3003
4a0dd9606c
Fixes wrong alt-title mentioned in description of Apprentice Engineer
2020-09-28 10:12:16 +10:00
Heroman3003
9c9d599529
Makes Lab Assistant a Scientist alt-title
2020-09-28 10:00:43 +10:00
Heroman3003
d45abb3275
Renames Lab Assistant into Research Intern
2020-09-28 09:58:35 +10:00
ShadowLarkens
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
Novacat
e8f7b01ea4
Merge branch 'master' into kk-adminships
2020-09-27 17:02:08 -04:00
Novacat
7561a5cfd6
Merge pull request #8926 from KillianKirilenko/kk-ships
...
Additional Ships
2020-09-27 17:01:12 -04:00
Atermonera
0f8be11335
Merge pull request #7689 from ShadowLarkens/email-tld
...
Job controller now uses using_map email TLD
2020-09-26 17:00:13 -04:00
Verkister
9da36f9244
earlyport cleave exploit fix
...
if ya can't poke them ya don't get to slash either
2020-09-24 11:15:39 +03:00
Novacat
0da6247010
Merge pull request #9098 from VOREStation/upstream-merge-7679
...
[MIRROR] Cycler sprite check fixes
2020-09-24 02:10:43 -04:00
cadyn
edac9082dd
Fix suit cycler checks ( #7679 )
2020-09-24 01:59:01 -04:00
Atermonera
03f7a2ad58
Merge pull request #7630 from Mechoid/ExoEncumberence
...
Exo Encumberence
2020-09-24 01:57:48 -04:00
Killian
498debf5d3
new crate spawner
...
adds a new spawner that can spawn a random empty crate, a random crate with loot, or sometimes just nothing.
2020-09-22 12:23:28 +01:00
Novacat
4b83c18fb7
Merge pull request #9071 from VOREStation/upstream-merge-7660
...
[MIRROR] Fix duplicate results from analyzing some objects
2020-09-21 16:54:29 -04:00
Rykka
534623b1fd
Delete accidentally-added file from Commcard PR
2020-09-21 16:01:46 -04:00
Novacat
d49640431d
Merge pull request #9062 from ShadowLarkens/tgui_finale
...
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Novacat
6fad165033
Merge pull request #9067 from VOREStation/upstream-merge-7651
...
[MIRROR] Tweaks to pickup/equip sounds.
2020-09-21 13:51:44 -04:00
Novacat
9eff136dc9
Merge pull request #9063 from VOREStation/upstream-merge-7642
...
[MIRROR] Adds two new augments to Traitor uplink
2020-09-21 13:50:29 -04:00
Novacat
5d129b77a6
Merge pull request #9076 from VOREStation/upstream-merge-7638
...
[MIRROR] Remove broken, unused commcard system from communicators
2020-09-21 13:41:55 -04:00
Novacat
adde0eeac9
Update sound.dm
2020-09-21 13:38:41 -04:00
Atermonera
a94f3189fd
Remove broken, unused commcard system from communicators
2020-09-21 12:37:52 -04:00
Meghan-Rossi
cbfd4789d7
Fix duplicate results from analyzing some objects ( #7660 )
2020-09-20 07:18:35 -04:00
Cerebulon
95ff8c2080
Tweaks to pickup/equip sounds.
2020-09-20 06:57:07 -04:00
Cyantime
2acf8dcbed
Fix floor safe plane ( #7648 )
2020-09-20 06:52:42 -04:00
SubberTheFabulous
378ba4f4c0
Adds two new augments to Traitor uplink
2020-09-20 06:49:58 -04:00
ShadowLarkens
3f191e4204
NanoUI Goes To Brazil
2020-09-20 02:36:46 -07:00
Verkister
e700936b20
Merge pull request #9042 from AmayaWah/testyourstuffamayapls
...
fixes typos + removes . from mechanical/viscerator
2020-09-20 12:10:31 +03:00
ShadowLarkens
375e178046
TGUI Photocopier & Guest Pass
2020-09-20 00:07:09 -07:00
ShadowLarkens
308e32c860
TGUI Agent Card
2020-09-19 22:57:51 -07:00
ShadowLarkens
b1c7c65cb6
TGUI Teleporter
2020-09-19 21:16:18 -07:00
ShadowLarkens
f61339ee5a
TGUI Arcade Battle
2020-09-19 20:41:24 -07:00
ShadowLarkens
bdb0dcc152
TGUI Janicart
2020-09-19 16:32:53 -07:00
ShadowLarkens
dc04f01e77
TGUI Oxygen/Anesthetic Pump
2020-09-19 15:00:16 -07:00
Novacat
febe12629b
Merge pull request #9049 from VOREStation/upstream-merge-7655
...
[MIRROR] Fixes janitor cart examine
2020-09-19 00:36:56 -04:00
Novacat
6f06b707c7
Merge pull request #9045 from VOREStation/upstream-merge-7664
...
[MIRROR] Enforces adjacency on wall rechargers
2020-09-19 00:36:01 -04:00
Atermonera
acb5b03041
Fixes janitor cart examine ( #7655 )
2020-09-18 23:41:15 -04:00