Commit Graph

8703 Commits

Author SHA1 Message Date
Verkister
7bffcf4ea2 Merge pull request #9242 from VOREStation/upstream-merge-7724
[MIRROR] Wall Cabinets & Crate Markings
2020-10-18 15:57:44 +03:00
Verkister
d6be6c90ad Merge pull request #9235 from VOREStation/upstream-merge-7726
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-18 15:57:07 +03:00
Verkister
541e85f8c0 Update walllocker.dm 2020-10-18 15:37:36 +03:00
Verkister
ab84aca7f9 Merge pull request #9227 from VOREStation/upstream-merge-7714
[MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
2020-10-18 15:28:44 +03:00
Killian
109135a35a Wall Cabinets & Crate Markings 2020-10-17 08:54:28 -04:00
Meghan-Rossi
3634234788 Fix most borosilicate shards disappearing instantly after being made (#7726)
*Fixed borosilicate glass not producing shards in most situations.
2020-10-17 06:06:15 -04:00
Atermonera
125ef651c8 Adds sifgrass floor tiles. Grass tiles spawn greengrass (#7714) 2020-10-17 02:05:55 -04:00
Amaya
4d9bc5fa19 AGAIN 2020-10-14 15:42:46 +02:00
Amaya
6cb7a5c479 adds 10 flora structures. 2020-10-01 16:55:54 +02:00
Killian
a639f767c9 talon cleanup/tweaks 2020-09-29 16:47:48 +01:00
David Winters
b6ac68836a please work PLEASE 2020-09-29 00:28:25 -04: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
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
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
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
ShadowLarkens
308e32c860 TGUI Agent Card 2020-09-19 22:57:51 -07:00
ShadowLarkens
bdb0dcc152 TGUI Janicart 2020-09-19 16:32:53 -07:00
Atermonera
acb5b03041 Fixes janitor cart examine (#7655) 2020-09-18 23:41:15 -04:00
ShadowLarkens
e9566c606d TGUI pAI Radio 2020-09-17 20:09:34 -07:00
ShadowLarkens
bff1c92997 TGUI Communicators 2020-09-17 07:27:14 -07:00
ShadowLarkens
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
Novacat
a7481a394a Merge pull request #9035 from ShadowLarkens/tgui_pda_rebase
TGUI PDAs/Uplink
2020-09-17 09:37:50 -04:00
ShadowLarkens
165bb939c7 TGUI Uplink 2020-09-16 21:31:51 -07:00
ShadowLarkens
637576848e TGUI PDAs Finale (minus newscaster) 2020-09-16 21:31:50 -07:00
ShadowLarkens
411486f7b4 Move PDA to code/modules/pda 2020-09-16 21:31:49 -07:00
Atermonera
8c593664fe Merge pull request #7607 from Mechoid/FixHacktool
Fixes the hacktool.
2020-09-16 23:16:38 -04:00
ShadowLarkens
735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07:00
Killian
ce327dd9de More Spawner Stuff (#7631)
* Update spacesuits.dm

* more random stuff

* even more random stuff, plus changelog

* random large, couple more odds & ends

* more tweaks

* More Spawners
2020-09-11 03:12:22 -04:00
Killian
eb8ecaddb2 hull/glass replacement, further polish, other misc tweaks
also adds plastitanium hull components for later use
2020-09-08 06:34:44 +01:00
Killian
bdaadc5726 general polish and prep
includes some groundwork for the second phase of this PR
2020-09-08 01:17:45 +01:00
Killian
5b4dc6069a all tests complete 2020-09-07 07:56:41 +01:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
Novacat
75186c414e Merge pull request #8987 from VOREStation/upstream-merge-7624
[MIRROR] Fixes explosion maths.
2020-09-05 12:25:19 -04:00
Novacat
5be90e22ff Update tanks.dm 2020-09-05 12:14:14 -04:00
Novacat
98cf24ad4c Merge pull request #8981 from VOREStation/upstream-merge-7614
[MIRROR] Update Random Spawners
2020-09-05 12:12:24 -04:00
Verkister
f4e5ab45af Fixes explosion maths. 2020-09-05 11:05:59 -04:00
Killian
c7242b59de Update Random Spawners (#7614)
* Update spacesuits.dm

* more random stuff

* even more random stuff, plus changelog

* random large, couple more odds & ends

* more tweaks
2020-09-05 10:26:14 -04:00