 BlackMajor
|
7ef06427c5
|
Removes the medihound red crosses
|
2019-09-10 11:07:54 +12:00 |
|
|
BlackMajor
|
0b581a1ded
|
Merge branch 'master' into Doggo-sit
|
2019-09-10 11:02:57 +12:00 |
|
|
BlackMajor
|
2db95cf164
|
Yes this is how github works.
|
2019-09-09 21:16:06 +12:00 |
|
|
BlackMajor
|
ede9716d98
|
Yeet
|
2019-09-09 21:12:40 +12:00 |
|
|
BlackMajor
|
e1e6496976
|
Me no comprendo github conflicts right now
|
2019-09-09 21:08:24 +12:00 |
|
|
BlackMajor
|
54edb7553a
|
Thank you github very cool
|
2019-09-09 21:02:32 +12:00 |
|
|
BlackMajor
|
683f46a051
|
Fuck
|
2019-09-09 20:57:32 +12:00 |
|
|
BlackMajor
|
574d41ff09
|
This better work
|
2019-09-09 20:55:23 +12:00 |
|
|
BlackMajor
|
8239f28944
|
FINE WE'LL DO IT YOUR WAY
|
2019-09-09 20:54:20 +12:00 |
|
|
BlackMajor
|
ce962490e3
|
Dab on merge conflict part 2
|
2019-09-09 20:52:08 +12:00 |
|
|
BlackMajor
|
a29fc4205f
|
Dab on merge conflict part 1
|
2019-09-09 20:51:01 +12:00 |
|
|
BlackMajor
|
c824f4a6fe
|
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
|
2019-09-09 20:38:51 +12:00 |
|
|
nik707
|
de055fe289
|
Merge pull request #9256 from Thalpy/INFINITE-FERMIES
[Consider speedmerging] Fixes the infinite clone problem.
|
2019-09-08 19:46:08 -04:00 |
|
|
Fermi
|
033057d380
|
OOPS
|
2019-09-08 02:55:40 +01:00 |
|
|
kevinz000
|
28aac1d779
|
Merge pull request #9248 from Trilbyspaceclone/warcrime!
NT/Synda* no longer commits war crimes back on Earth
|
2019-09-07 11:50:33 -07:00 |
|
|
kevinz000
|
4d805331df
|
Merge pull request #9229 from Trilbyspaceclone/patch-220
Gives emags 5 more uses on buy
|
2019-09-07 11:35:55 -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 |
|
|
TrilbySpaceClone
|
a91eb608cd
|
All of the objects
|
2019-09-06 13:56:10 -04:00 |
|
|
TrilbySpaceClone
|
c4f99adc3c
|
Revert "No more!"
This reverts commit 9cc7f08668.
|
2019-09-06 12:18:50 -04:00 |
|
|
TrilbySpaceClone
|
9cc7f08668
|
No more!
|
2019-09-05 18:56:46 -04:00 |
|
|
BlackMajor
|
fbc2d3c8fe
|
Ports dogborg sprites from RP to main
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
|
2019-09-06 01:23:53 +12: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 |
|
|
nik707
|
dd7907c3d7
|
Merge pull request #9057 from EgoSumStultus/male-AI-vox
Adds the Male AI vox voice.
|
2019-09-02 18:27:03 -05:00 |
|
|
Sishen
|
3b40f73266
|
prayer beads no longer instantly deconvert, now inject holy water
|
2019-08-31 18:37:00 -04:00 |
|
|
Trilbyspaceclone
|
f9e12378e9
|
Update ids.dm
|
2019-08-31 18:34:20 -04:00 |
|
|
Trilbyspaceclone
|
a43a497114
|
Update ids.dm
|
2019-08-31 18:15:32 -04:00 |
|
|
Sishen
|
b4f27b8841
|
allows renaming of non null rod holyweapons, fixes hypertool description
|
2019-08-31 18:05:09 -04:00 |
|
|
nik707
|
c826e1b412
|
Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
|
2019-08-31 02:06:33 -05: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 |
|
|
lolman360
|
fee4209ec3
|
fffffffffffffffffffffffffffffffa
|
2019-08-31 10:16:03 +10:00 |
|
|
Sishen
|
b69c928419
|
FOR THE EMPEROR
|
2019-08-30 16:50:03 -04:00 |
|
|
nik707
|
dfdbb23d99
|
Merge pull request #9178 from deathride58/polyfix
fixes the poly tgs command not working at all
|
2019-08-29 19:45:11 -05:00 |
|
|
nik707
|
bfd17d66cd
|
Merge pull request #9074 from Citadel-Station-13/donator_grouping
Donator grouping system
|
2019-08-29 18:31:23 -05: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 |
|
|
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 |
|
|
Sishen
|
3f86a92efa
|
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
|
2019-08-23 14:42:35 -04:00 |
|
|
deathride58
|
1376791e7a
|
fixes the poly tgs command not working at all
|
2019-08-22 20:13:56 -04:00 |
|
|
deathride58
|
fc2fdf71ca
|
Merge pull request #9164 from lolman360/sprites
lolman fucks up his first pr
|
2019-08-21 11:17:39 -04:00 |
|
|
kevinz000
|
1e76941160
|
Merge pull request #9155 from Poojawa/Poly-bot-lite
Enables Poly phrases on tgs commands
|
2019-08-21 08:10:23 -07:00 |
|
|
lolman360
|
a83dea7bd0
|
eeeeeeeeeeeeeeeeepic
|
2019-08-20 10:01:53 +10:00 |
|
|
Sishen
|
ed2c3f3cbd
|
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
|
2019-08-19 13:53:05 -04:00 |
|
|
Poojawa
|
a0308a2760
|
Enables Poly phrases on tgs commands
|
2019-08-18 08:29:28 -05:00 |
|
|
lolman360
|
e838da8039
|
Merge pull request #3 from Citadel-Station-13/master
3
|
2019-08-17 11:55:56 +10:00 |
|
|
kevinz000
|
9071917e72
|
Merge pull request #9088 from Poojawa/blurry-runtimes
Fixes some runtimes and removes a holodeck exploit
|
2019-08-16 17:05:21 -07:00 |
|
|
kevinz000
|
ce62780ba0
|
Merge pull request #9095 from fludd12/snowflake-b-gone
Un-snowflakes My Custom Item
|
2019-08-16 17:04:45 -07:00 |
|
|
kevinz000
|
97306ff53c
|
Merge pull request #9107 from deathride58/fixesarest
Fixes handcuffs being impossible to actually resist out of
|
2019-08-16 16:57:36 -07:00 |
|
|
kevinz000
|
fb2971e3e6
|
Merge remote-tracking branch 'origin/master' into donator_grouping
|
2019-08-15 14:40:44 -07:00 |
|
|
Poojawa
|
017a3111ec
|
Yeah this is a much, much better way of doing it.
|
2019-08-15 08:37:10 -05:00 |
|
|
Poojawa
|
3de3f511cf
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
|
2019-08-15 08:24:55 -05:00 |
|
|
lolman360
|
e0dbfbd88c
|
bhjin said i don't NEED muzzle sprites so fuck it
|
2019-08-15 09:47:55 +10:00 |
|