Commit Graph

34506 Commits

Author SHA1 Message Date
TheFurryFeline
0aa11a1813 Pre-emptive Conflict Prevention
Just noticed that my comments were very different and the mirror that's in will conflict if I don't commit this change.
2019-06-06 13:38:31 -04:00
TheFurryFeline
b8bbe08b83 Infinite Frame Fixy
Ports a fix from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/855 to prevent creation of infinite frames with doorbell chimes. Eliminates the runtime that would result from failed deconstruction.
2019-06-03 20:50:18 -04:00
Novacat
b88ba6f233 Merge pull request #5279 from Heroman3003/crateaccess
Access fixes for carogopacks
2019-06-02 14:45:57 -04:00
Novacat
db88e4ce47 Merge pull request #5297 from Heroman3003/mercrename
Renames Syndicate Commandos to Mercenary Commandos
2019-06-02 13:07:54 -04:00
Heroman
34115d5a48 Renames Syndicate Commandos to mercs 2019-06-02 17:49:37 +10:00
Heroman
3e62bbcca1 Moves restriction to _vr file 2019-06-02 07:13:15 +10:00
Neerti
5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights
Fixes some Precursotech oversights.
2019-05-31 22:18:00 -04:00
Novacat
ae20565d46 Merge pull request #5286 from VOREStation/upstream-merge-6154
[MIRROR] Sif Trees and Icon Scaling
2019-05-30 13:15:12 -04:00
Unknown
c7333d5a30 Conflict Resolution 2019-05-30 13:04:41 -04:00
Novacat
eb5b57286d Merge pull request #5288 from VOREStation/upstream-merge-6169
[MIRROR] Ports Radial Menus
2019-05-28 15:31:51 -04:00
Neerti
f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1
Ports Radial Menus
2019-05-28 14:25:49 -04:00
Neerti
914fc74a7a Merge pull request #6182 from mistyLuminescence/eventroundstart
No More Pre-Roundstart Events
2019-05-28 14:24:35 -04:00
Novacat
3d40c4f38c Merge pull request #5284 from VOREStation/upstream-merge-6176
[MIRROR] Fixes graveyard drones becoming antag
2019-05-28 13:57:24 -04:00
Novacat
8b67854044 Merge pull request #5282 from VOREStation/upstream-merge-6175
[MIRROR] Fixed mining drill brace deconstruction issue
2019-05-28 13:54:26 -04:00
Atermonera
f78a4e1dc8 Sif Trees and Icon Scaling 2019-05-28 13:21:39 -04:00
Atermonera
0a8c048eb6 Merge pull request #6176 from GeneriedJenelle/patch-2
Fixes graveyard drones becoming antag
2019-05-28 13:12:55 -04:00
Atermonera
4cde759fac Merge pull request #6175 from Heroman3003/braceself
Fixed mining drill brace deconstruction issue
2019-05-28 13:11:27 -04:00
Atermonera
ef4c7b6601 Merge pull request #6172 from mistyLuminescence/contacts
Makeover Kit
2019-05-28 13:10:09 -04:00
Heroman3003
316f4754cb Fixes restriction 2019-05-28 12:42:15 +10:00
Heroman3003
43cad962c6 More adjusting 2019-05-28 12:21:13 +10:00
Heroman3003
7ef057227c Access fixes for carogopacks 2019-05-28 12:13:55 +10:00
Unknown
2071f9273e Allows Benches/Racks to support laptops 2019-05-27 12:15:51 -04:00
Unknown
34547c3282 Adds some differences for rugged laptops 2019-05-27 12:09:31 -04:00
Unknown
7515df6187 Another new sprite 2019-05-27 12:01:00 -04:00
Unknown
63fff025bb New Modular Computer Sprites
- New laptop sprite, currently only used for the elite model
- New console sprite that matches pre-existing consoles

Also fixes a bug with Pathfinder spawning
2019-05-27 11:22:33 -04:00
Unknown
04341df092 Timer SS Fix Part two
Update of Polaris PR
2019-05-27 01:02:39 -04:00
Unknown
d13e8ee784 Critical Fixes
- Fixes HREF Exploit
- Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
- Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
- Fixes #5272
2019-05-26 23:58:56 -04:00
Novacat
10a1f2f0ed Update borer.dm 2019-05-24 02:04:10 -04:00
Atermonera
38e657c83f Borers TLC 1 2019-05-24 02:01:56 -04:00
Novacat
de395726ad Grumble grumble code standards grumble grumble 2019-05-23 13:38:01 -04:00
Novacat
64690a8540 Update medical.dm 2019-05-23 13:29:49 -04:00
mistyLuminescence
42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Mechoid
7a35723d85 Sif Animal Expansion 1 2019-05-21 19:58:19 -04:00
Neerti
5ed3916de3 Merge pull request #6166 from Sebbe9123/fixholoprojectors
Lets sec people carry holoprojectors in their belts
2019-05-20 18:43:52 -04:00
Neerti
3e1555c4f8 Merge pull request #6167 from Heroman3003/laptop-bugfixes
Fixes some bugs with laptop
2019-05-19 17:24:10 -04:00
Heroman
ed8cdf33dc fixes copypaste mistake 2019-05-20 05:59:14 +10:00
Heroman
153a7f26f2 Adds mind role change 2019-05-16 16:37:28 +10:00
Heroman
8ab2abe151 Adds favial checking to timeclock 2019-05-16 16:29:07 +10:00
InterroLouis
7b3e62e571 Add files via upload 2019-05-15 13:26:33 -04:00
Novacat
4cb0f34bbf Merge pull request #5227 from VOREStation/upstream-merge-6072
[MIRROR] [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.
2019-05-14 00:01:34 -04:00
Novacat
9b291fa5b2 Merge pull request #5226 from VOREStation/upstream-merge-6160
[MIRROR] Fixes access restrictions for com&com MC program
2019-05-14 00:01:14 -04:00
Novacat
f39068dd19 Merge pull request #5225 from VOREStation/upstream-merge-6152
[MIRROR] Restricts alarm monitor MC program access to engineering
2019-05-14 00:01:06 -04:00
Novacat
61561e722c Merge pull request #5224 from VOREStation/upstream-merge-6153
[MIRROR] Restricts camera access on MC
2019-05-13 23:13:21 -04:00
Novacat
09dedeb6c9 Update alarm_monitor.dm 2019-05-13 22:57:31 -04:00
Neerti
f830985d38 Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG
[RNG is the new RNG] Converts a bunch of events to the Game Master datum system.
2019-05-13 22:57:23 -04:00
Neerti
fb5a2f1904 Merge pull request #6160 from Heroman3003/commod-fix
Fixes access restrictions for com&com MC program
2019-05-13 22:57:12 -04:00
Novacat
ad5fa6c7e3 Update camera.dm 2019-05-13 22:57:06 -04:00
Novacat
d95b7fda42 Update camera.dm 2019-05-13 22:56:41 -04:00
Neerti
74aa8184bf Restricts alarm monitor MC program access to engineering 2019-05-13 22:55:57 -04:00
Neerti
31174cee2d Restricts camera access on MC 2019-05-13 22:55:47 -04:00