Commit Graph

845 Commits

Author SHA1 Message Date
variableundefined
9baf91fdfe Add baycard to map, loadout & datum. Replacing normal non-syndicate cards with them. 2018-10-31 17:12:43 +08:00
variableundefined
c373185e1e Revert "(TGCRP) - /tg/ catgirl refugee program" 2018-10-27 13:06:42 +08:00
tigercat2000
1aa33c97ea Nyaaaaa~ 2018-10-25 19:59:30 -07:00
variableundefined
569f68b128 Merge branch 'master' into RelPath 2018-10-12 14:08:19 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined
309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
variableundefined
352948d869 Merge pull request #9505 from Tails2091/KarmaKCleanup
Karma Cleanup
2018-09-29 09:33:24 +08:00
Tails2091
07eb540c42 Removed Returns From Switch And Added Early Return 2018-09-28 21:26:35 -04:00
Gwydion Brain
d426ed1879 Adds comments and loadout 2018-09-27 14:17:32 -07:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Tails2091
f63db004f8 Karma Cleanup 2018-09-08 14:25:42 -04:00
Ty-Omaha
5994cab9a9 spacing 2018-08-28 16:05:39 -04:00
Ty-Omaha
40abccc8c5 Nt rep stamp 2018-08-28 14:41:57 -04:00
Fox McCloud
ebe0b82bb0 Species Refactor Fixes 2018-07-23 01:28:58 -04:00
Fox McCloud
81133f7bb5 and another minor one 2018-07-20 01:24:43 -04:00
Fox McCloud
dea0b0156a minor fix 2018-07-20 01:05:47 -04:00
Fox McCloud
f075ef7836 wow, it works 2018-07-17 06:05:06 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Crazy Lemon
384fe93d33 Merge pull request #8975 from Citinited/rpd-refactor
RPD refactor
2018-07-16 14:22:38 -07:00
Citinited
29c6e6d69b A bunch of refactoring; RPD runtimes if a forbidden pipe is attempted to be dispensed; names loose disposals pipes 2018-07-16 00:23:03 +01:00
Crazy Lemon
25d0bce893 Merge pull request #8307 from Allfd/supermatter
Update SM
2018-07-11 12:37:20 -07:00
Fox McCloud
a3b5cf83e4 tweaks 2018-07-09 04:16:25 -04:00
Fox McCloud
70797c08c7 more round-start mechanical organs 2018-07-09 01:57:39 -04:00
Fox McCloud
27ebe7a6fe Standardized Robotic Organ Checking--Removes Mechassited Organs 2018-07-07 21:33:42 -04:00
Alffd
0a6f13163d Fix UI gifs not being in asset cache/loading in header 2018-06-21 19:04:55 -04:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
tigercat2000
2d9d4d51e1 Merge pull request #9002 from Kyep/ds_fix
DS / prefs fix
2018-06-08 11:59:05 -07:00
tigercat2000
5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
Kyep
631e7bee35 DS / prefs fix 2018-05-09 19:08:07 -07:00
Ansari
cf307b6217 Add kitty ears to load out 2018-04-28 12:07:35 +08:00
tigercat2000
a2507f589d Rust-G integration. Makes logging procs 2-3 times less expensive (EVEN WITH CALL OVERHEAD). tgstation/tgstation#36858 2018-04-19 15:08:59 -08:00
tigercat2000
c03621c508 Completely Overhaul Logging
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
2018-04-19 15:07:59 -08:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
KasparoVy
cf351543ce Removes Job Restriction from Purely Cosmetic and Rarely Used Veils
Roboticist wasn't even spelled correctly. No idea if there were any other typos.
2018-04-09 03:00:27 -04:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC
# Conflicts:
#	code/__DEFINES/flags.dm
2018-03-22 15:35:12 -07:00
tigercat2000
d88a17a0f4 Fix runtimes, remove world init BS, UpdateTickRate() 2018-03-20 18:32:45 -07:00
Regen
ff68c12b31 Removes purple hair flower pin
Removes the purple hair flower pin, as this is my fluff item.

@Tigercat2000 is moving the sprite to the correct folder then he's available.

:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
2018-03-06 01:36:10 +01:00
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
tigercat2000
c998400ce8 Merge pull request #8619 from MarcellusPye/GhostPrefs
Fixes #8474
2018-01-29 14:18:34 -08:00
MarcellusPye
1d92b126fc Inital fix 2018-01-30 00:45:43 +13:00
uraniummeltdown
a3a0e83908 adds sql update file
fixes clientfps not saving
2018-01-27 23:24:45 +05:00
FalseIncarnate
96c615132a Adds departmental and head of staff mugs
Adds mugs for each department to the loadout.
- The service mug is available to all jobs

Adds mugs for heads of staff, found in their respective locker.
- CE, RD, CMO, HoS, HoP, Captain

Moved mugs to their own loadout category
2018-01-25 01:52:04 -05:00
uraniummeltdown
045dc03f86 checks for 511 2018-01-24 21:03:44 +05:00
uraniummeltdown
5b53582f0e adds var/client/parent to /datum/preferences
allows users to change client fps with a preference
2018-01-24 20:44:10 +05:00
FalseIncarnate
23c883bd57 Coffee Mugs and Vendor Change
Adds coffee mugs
- Available from hot drink vendors or loadout menu (1 point)

Adds novelty coffee mugs
- Available as a premium item from the hot drinks vendors or from the
loadout menu (2 points)

Adds support for an "item slot" in vendors, which allows an item to be
inserted into a vendor.

Adds the ability to add containers into the hot drinks machine.
- Will attempt to fill the inserted container with purchased beverages.
- Excess will still dispense in a new cup, as if there was not a
container present.

🆑
rscadd: Adds coffee and novelty mugs to the hot drinks machine and
loadout menu.
rscadd: Adds the ability to insert containers into the hot drink
machine, filling the container with your purchase.
/🆑
2018-01-22 22:46:03 -05:00
Jountax
d15b30f25b Update loadout_shoes.dm 2018-01-10 02:58:56 -05:00
Jountax
5540412229 Update loadout_shoes.dm 2018-01-09 02:45:43 -05:00