cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 03:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,364 Commits 26 Branches 2 Tags
90ff882149c5ce6872de5cd2b45708b6094183bf
Commit Graph

481 Commits

Author SHA1 Message Date
Kyep
079848cccc evilfax/bless update 2018-11-13 18:16:49 -08:00
variableundefined
4778d4de5d Merge pull request #10062 from Dave-TH/paper_fix 
Paper Bundles No Longer Automatically Display Their Contents
 2018-10-30 10:53:58 +08:00
Unknown
f4d5f73261 Fixes Paper Bundles Bug 2018-10-29 21:31:49 -04:00
joep van der velden
e6ef48c39e Bad renault 2018-10-27 16:27:31 +02:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID 
Href refactor: macros and playerpanel
 2018-10-19 07:46:42 +08:00
tigercat2000
b4001d9ab8 Merge pull request #9446 from variableundefined/PaperBundleRuntime 
Fixes paper bundle runtimes
 2018-10-14 07:22:38 -07:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
variableundefined
68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art 
Fixes half the server crashing, removes canvases
 2018-09-29 07:49:30 +08:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Ty-Omaha
28acdb1e56 removes canvases 2 
fully removes it as per tiger's critique
 2018-09-12 02:40:32 -04:00
alex-gh
49f3a47c31 Ghosts can no longer eject IDs from fax machines and ID computers. 2018-09-09 00:28:14 +02:00
variableundefined
ade853c742 remove excessive the 2018-09-04 09:41:09 +08:00
variableundefined
bd8f0396c2 Photocopier safety check 2018-08-29 22:40:16 +08:00
variableundefined
413cbe00eb Fixes paper bundle runtimes 2018-08-29 22:00:24 +08:00
Ty-Omaha
40abccc8c5 Nt rep stamp 2018-08-28 14:41:57 -04:00
Mars
f2532e74ba Merge conflict fix 2018-08-28 11:28:13 +02:00
Crazy Lemon
ca003e0e3b Merge pull request #9330 from variableundefined/Cardfix 
Polaris card bugfix (Plus paperbin)
 2018-08-22 22:28:44 -07:00
Mars
bedaad976f Ensure admin\topic.dm uses mostly locateUID 2018-08-17 20:06:22 +02:00
Mars
4fa906951a Use of the flexible macro 
Mostly regex to catch every \ref with the same formatting, with their
reference and display name.
 2018-08-16 20:04:53 +02:00
Mars
b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars
e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Mars
4d3c3b29e4 Quick Regex replace action 
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
 2018-08-15 23:57:46 +02:00
Mars
a5c9cfd1cb Fixes and polishes fax radio replies 
Can use the radio option to reply to faxes again.
Centcomm doesn't reply over radio to syndicate faxes.
Removes unreachable code.
 2018-08-12 12:00:32 +02:00
variableundefined
708681d9c0 Bugfixes for polaris card 2018-08-08 22:21:19 +08:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Crazylemon64
7b4dd7eb19 Cleans out various macro redefinitions or useless use of syntax 2018-07-30 23:24:35 -07:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud
b2c8f051b1 Merge remote-tracking branch 'upstream/master' into camera-damage-refactor 2018-07-15 16:31:50 -04:00
Fox McCloud
ef23639921 Merge pull request #8875 from Citinited/put-that-cookie-down 
Adds random fortunes to fortune cookies
 2018-07-11 13:55:28 -04:00
Crazy Lemon
f1fc9375f5 Merge branch 'master' into LabelerLogging 2018-06-30 20:19:53 -07:00
Kyep
9660aac6d2 fix docs, change timing 2018-06-17 21:39:17 -07:00
Citinited
b43ffe380f Removes unused var; deletes blank paper once cooked 2018-06-09 22:54:22 +01:00
Kyep
4d4eb16a3a fixes merge conflict 2018-06-06 16:32:31 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Fox McCloud
66dd09ea4f arbitrary 2018-05-20 05:58:14 -04:00
Ansari
2152325076 Uses define instead of string 2018-05-18 11:37:22 +08:00
Ansari
de62acadf4 Add labeler to investigate logs 2018-05-17 18:27:11 +08:00
tigercat2000
28c0302fb4 Merge pull request #8991 from RyanSmake/fuckingfaxes 
Fax machines are no longer photocopiers
 2018-05-09 11:23:29 -07:00
ryansmake
f1a71a02fc Fax machines are no longer photocopiers 2018-05-07 22:04:36 +02:00
tigercat2000
7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs 
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
 2018-04-28 17:55:15 -07:00
Kyep
c3f271449e fixes merge conflicts with weapon removals 2018-04-26 00:09:18 -07:00
Kyep
08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Citinited
452e2b723a fortune cookies aren't weapons silly 2018-04-20 19:41:57 +01:00