Desolate
f7627d2fcb
Resolves conflicts.
2018-10-11 05:36:22 -05: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
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
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
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
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
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
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
Alffd
b860fe72c9
Remove items from donor preferences with wrong license.
2018-01-03 21:29:23 -05:00
Crazy Lemon
3bbf29b487
Merge pull request #8292 from Kyep/ability_requirements
...
NT medical screening for key jobs
2017-12-05 15:25:36 -08:00
Jountax
4597d2707a
Added laceup shoes
...
Laceup shoes can now be bought for 1 loadout point. People who hate having sneakers at roundstart rejoice!
Here's hoping I did this right.
🆑 Jountax
rscadd: Can now add laceup shoes to your loadout.
/🆑
2017-11-16 18:19:18 -05:00
Kyep
a47f2a9fb2
NT medical screening for key jobs
2017-10-22 02:23:59 -07:00
Ansari
03fb4925f1
fix prefs
2017-10-18 12:02:37 +08:00
tigercat2000
b8d6051c66
Merge pull request #7482 from Aurorablade/DreamFluff
...
Phantasmic Dream Fluff:Zekes Tendrils
2017-10-15 13:53:02 -07:00
Aurorablade
f4f82a6825
Armbands
2017-10-09 20:42:28 -04:00
Aurorablade
df3d13ad7d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
2017-09-02 22:49:05 -04:00
Landerlow
9a01252a2a
Added the scrambled speech to the list and changed dizziness
2017-08-26 12:46:46 +02:00
Landerlow
71be8f3c8b
Adds more roundstart disability options
2017-08-25 18:44:33 +02:00
Aurorablade
9956a4a90a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
2017-08-23 17:37:22 -04:00
tigercat2000
ebabda1223
Merge pull request #7366 from KasparoVy/mob_rgb_to_hex
...
Converts Mob Colours to Hexadecimal
2017-08-16 12:52:13 -07:00
Fox McCloud
2dcae64f3a
Merge pull request #7876 from Aurorablade/Clothes
...
Obligatory Vox in a Corset
2017-08-06 08:53:13 -04:00
Aurorablade
8e5f3102ff
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
2017-07-31 17:20:30 -04:00
Aurorablade
d6edfe8ccf
Corsets are now an acessory
2017-07-26 19:05:32 -04:00
Aurorablade
a962d3abde
I HATE WHEN I FORGET TO COMMIT THINGS
2017-07-26 01:46:30 -04:00
Aurorablade
d423ba9b7d
redoes corset utterly
2017-07-26 01:34:52 -04:00
Aurorablade
04d4244b90
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Clothes
2017-07-26 00:07:24 -04:00
Fox-McCloud
f78c507122
Sound Update/Refactor
2017-07-25 20:35:38 -04:00
