Ghommie
ff451c8cf4
I don't want to send emoji assets to every machine interfacing with PDA messages.
...
Just the chat tab.
2019-09-22 14:50:37 +02:00
Ghommie
bf2f4b5df1
Enables emojis for PDA messages.
2019-09-21 22:42:06 +02:00
kevinz000
5608d37fd5
Merge pull request #9263 from Trilbyspaceclone/batter_up
...
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000
9108c1ce89
Merge pull request #9203 from Trilbyspaceclone/fancy
...
Makes brass tools look better*
2019-09-20 12:09:33 -07:00
Ghommie
5e52c62f29
actual balance.
2019-09-17 03:41:53 +02:00
Ghommie
0d9b284784
unneeded variable, no gameplay changes.
2019-09-16 18:12:05 +02:00
Ghommie
ca95d39a46
Slowing down police baton and tele baton speed.
2019-09-16 17:47:22 +02:00
kevinz000
eab0b8934f
Merge pull request #9279 from Ghommie/Ghommie-cit192
...
Fixing undergarments color preferences resetting each round.
2019-09-13 10:43:43 -07:00
kevinz000
42613d1800
Merge pull request #9251 from Linzolle/chaplain-fashion-time
...
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
Linzolle
213bd2fc6b
fixes
2019-09-12 23:35:21 -05:00
Ghommie
e0a29ec001
Fixing undergarments color resetting each round.
2019-09-12 02:48:26 +02:00
kevinz000
f4bff19592
Merge pull request #9260 from dapnee/trim-decals
...
Ports trim decals
2019-09-11 03:26:47 -07:00
kevinz000
076b6c8699
Merge pull request #9077 from Sishen1542/id-boingo
...
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
Trilbyspaceclone
d61afe0021
Update uplink_kits.dm
2019-09-10 20:29:31 -04:00
Trilbyspaceclone
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
Trilbyspaceclone
02771c9d27
Why didnt my last commit save at all?
2019-09-08 22:10:31 -04:00
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
Dap
9f275ebf01
Ports trim decals
...
## About The Pull Request
So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.
## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
kevinz000
3e9d37e70d
Update plushes.dm
2019-09-07 17:13:21 -07:00
kevinz000
b8374feafd
Update plushes.dm
2019-09-07 17:03:06 -07:00
Linzolle
64b757f404
refactor suits
2019-09-07 17:10:10 -05:00
Linzolle
20ea620e9e
literally why even
2019-09-07 16:46:25 -05:00
kevinz000
8f577e910a
Merge pull request #9238 from Trilbyspaceclone/surgery_stuff
...
Adds two more surgerys - Embalming and Body Rejuvenation
2019-09-07 11:37:13 -07:00
kevinz000
09ed526594
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
...
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
kevinz000
87cf0b971a
Merge pull request #9221 from Sishen1542/chappy
...
adds some new nullrods with some back end null rod refactors
2019-09-06 16:47:46 -07:00
Chayse Ramsay
0cf1415969
[SPEEDMERGE] Glass Machine :b:roke
2019-09-05 16:28:18 +01:00
TrilbySpaceClone
084b37ae4e
tada
2019-09-04 10:13:32 -04:00
Sishen
d431ee1a20
baseball bat
2019-09-04 03:01:47 -04:00
nik707
2fe5571887
Merge pull request #9212 from dapnee/plasmaglass-tables-spears
...
Plasmaglass Tables, Spears, Shards (Take 2)
2019-09-02 18:37:22 -05:00
nik707
67f4276aab
Merge pull request #9104 from Sishen1542/tbaton
...
classic & telebaton no longer have attack delay
2019-09-02 18:35:56 -05:00
Sishen
0b6eb6e34c
Update holy_weapons.dm
2019-09-01 22:36:39 -04:00
Sishen
b4f27b8841
allows renaming of non null rod holyweapons, fixes hypertool description
2019-08-31 18:05:09 -04:00
Sishen
d9fff579b1
damage and stamina balances
2019-08-31 17:39:51 -04:00
Sishen
ba5021af5b
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
2019-08-31 02:55:29 -04:00
Sishen
b69c928419
FOR THE EMPEROR
2019-08-30 16:50:03 -04:00
nik707
bff828d3be
Merge pull request #9202 from Trilbyspaceclone/patch-216
...
Ports "Fixes wallets #510 " From KeplerStation
2019-08-29 19:33:08 -05:00
nik707
fccafd6bd9
Merge pull request #9204 from Trilbyspaceclone/patch-217
...
Fixes katana's being cursed when not cursed
2019-08-29 19:31:40 -05:00
Dap
19678119c5
Merge branch 'plasmatables' into plasmaglass-tables-spears
2019-08-28 14:55:01 -06:00
nik707
8e40e9d887
Merge pull request #9186 from Sishen1542/walklikeanegyptian
...
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
2019-08-28 00:02:39 -05:00
BlackMajor
4d6b9f5da1
Merge pull request #8537 from Ghommie/Ghommie-cit28
...
Fixes emags wasting charges on un-emaggable stuff.
2019-08-28 13:54:03 +12:00
Trilbyspaceclone
6cf4783486
fixed
2019-08-27 13:56:47 -04:00
TrilbySpaceClone
419ea7f58c
Fancy_part1
2019-08-27 12:41:47 -04:00
Trilbyspaceclone
77863119f2
Update wallets.dm
2019-08-27 11:31:52 -04:00
kevinz000
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
Dap
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
kappa-sama
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
chefferz
3fcf9b329f
Update his_grace.dm
2019-08-23 21:46:04 -04:00
Sishen
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
Dap
a80dfada21
[WIP] Plasmaglass Tables!
...
## About The Pull Request
Hey hey people, now you can have pink tables. The scientists on SS13 have really out done themselves today. So far it drops regular glass shards, but tg already has plasma glass shards that I'll try to port once I get around to it.
## Why It's Good For The Game
New thing for people to make, basically a stronger table, but it still breaks when a player stands on it.
## Changelog
🆑
add: Plasmaglass tables
/🆑
2019-08-23 12:38:07 -06:00
