dbe871bd9b
Merge pull request #704 from CHOMPStationBot/upstream-merge-9235
...
[MIRROR] [MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-19 18:10:20 -07:00
16a23eadec
Merge pull request #9235 from VOREStation/upstream-merge-7726
...
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-19 10:37:24 +00:00
d7298336a8
Merge pull request #9242 from VOREStation/upstream-merge-7724
...
[MIRROR] Wall Cabinets & Crate Markings
2020-10-19 10:37:04 +00:00
bd1503a35d
Realized I could touch up the interactions a bit
2020-10-15 23:37:26 -04:00
163dc56069
Only eggs can sustain me
2020-10-15 20:34:13 -04:00
0a8521f900
Merge pull request #568 from cadyn/vspull
...
Direct pull from virgo
2020-10-06 20:52:54 -07:00
ef5f28cb0c
Merge pull request #551 from Holdelta/master
...
Reverting changes to the RMS
2020-10-06 15:40:56 -06:00
1d0e69633f
Fix silly stuff
2020-10-05 19:46:50 -07:00
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
6cb7a5c479
adds 10 flora structures.
2020-10-01 16:55:54 +02:00
a639f767c9
talon cleanup/tweaks
2020-09-29 16:47:48 +01:00
b6ac68836a
please work PLEASE
2020-09-29 00:28:25 -04:00
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
e8f7b01ea4
Merge branch 'master' into kk-adminships
2020-09-27 17:02:08 -04:00
7561a5cfd6
Merge pull request #8926 from KillianKirilenko/kk-ships
...
Additional Ships
2020-09-27 17:01:12 -04:00
8cc3e87f1b
Update scannable fabricator pathname
2020-09-26 15:13:00 -07:00
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
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
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
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
534623b1fd
Delete accidentally-added file from Commcard PR
2020-09-21 16:01:46 -04:00
d49640431d
Merge pull request #9062 from ShadowLarkens/tgui_finale
...
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
6fad165033
Merge pull request #9067 from VOREStation/upstream-merge-7651
...
[MIRROR] Tweaks to pickup/equip sounds.
2020-09-21 13:51:44 -04:00
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
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
a94f3189fd
Remove broken, unused commcard system from communicators
2020-09-21 12:37:52 -04:00
a8d4104fea
added tesh plush ears, fixed PEili not apearing on head.
2020-09-20 17:23:14 -05:00
cbfd4789d7
Fix duplicate results from analyzing some objects ( #7660 )
2020-09-20 07:18:35 -04:00
95ff8c2080
Tweaks to pickup/equip sounds.
2020-09-20 06:57:07 -04:00
2acf8dcbed
Fix floor safe plane ( #7648 )
2020-09-20 06:52:42 -04:00
378ba4f4c0
Adds two new augments to Traitor uplink
2020-09-20 06:49:58 -04:00
3f191e4204
NanoUI Goes To Brazil
2020-09-20 02:36:46 -07:00
308e32c860
TGUI Agent Card
2020-09-19 22:57:51 -07:00
bdb0dcc152
TGUI Janicart
2020-09-19 16:32:53 -07:00
c55ea87e94
Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions
2020-09-19 03:03:11 -05:00
71266ace1e
added new plushies to drop lists
2020-09-19 03:03:09 -05:00
acb5b03041
Fixes janitor cart examine ( #7655 )
2020-09-18 23:41:15 -04:00
e9566c606d
TGUI pAI Radio
2020-09-17 20:09:34 -07:00
bff1c92997
TGUI Communicators
2020-09-17 07:27:14 -07:00
9163d0b9b5
Remove broken, unused commcard system from communicators
...
This is being done to help facilitate the transfer to TGUI. These
commcards are part of a project that never really got finished, and the
majority of them do not even function in their current implementation,
with only barebone templates and half-made integration.
While it would be neat to have these function one day, I believe it
would be for the best to remove their current implementation wholesale
as this commit does, and allow them to be reintegrated at a later time
when communicators have been converted to TGUI and NanoUI has been
eliminated.
2020-09-17 07:24:30 -07:00
a7481a394a
Merge pull request #9035 from ShadowLarkens/tgui_pda_rebase
...
TGUI PDAs/Uplink
2020-09-17 09:37:50 -04:00
165bb939c7
TGUI Uplink
2020-09-16 21:31:51 -07:00
637576848e
TGUI PDAs Finale (minus newscaster)
2020-09-16 21:31:50 -07:00
411486f7b4
Move PDA to code/modules/pda
2020-09-16 21:31:49 -07:00
8c593664fe
Merge pull request #7607 from Mechoid/FixHacktool
...
Fixes the hacktool.
2020-09-16 23:16:38 -04:00
d389a57133
Merge branch 'master' into kbraid.edit/additions
2020-09-16 13:38:00 +02:00
a712a23562
I missed a few commas
2020-09-15 23:14:21 -07:00
f0b826a2d7
Reverting changes to RMS.
...
Removing upstream changes.
2020-09-15 23:04:53 -07:00
565bb2a522
fixed a line
2020-09-15 19:35:29 -05:00
55d8523787
teshari alternate placement slots (plush only)
...
was only able to figure out how to do it for the plushie. someone else will need to do the living tesh.
2020-09-15 19:34:40 -05:00
Razgriz