DeltaFire
73d3234882
buncha changes
2020-12-07 22:15:04 +01:00
DeltaFire
2d8655d712
plushie shapeshifter
2020-09-13 03:25:43 +02:00
kiwedespars
bff11c4fe5
fixes, changes.
...
- buffed eldritch fluid
- readded patron's reach as a 1 point off from aggressive spread
- buffed amount of ghouls flesh can have.
- buffed the stam regen of rust a little bit.
- fixed sacrifices not giving points if they were in your pockets (thanks to tgstation/tgstation#51648 )
- removal of heretic status no longer gives a loud deconvert message (thanks to tgstation/tgstation#52629 )
- description fixes, eldritch amulet now works.
2020-08-13 01:12:10 -07:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
Lin
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
silicons
1f25c7f06d
Merge remote-tracking branch 'citadel/master' into shoelaces
2020-07-23 16:23:34 -07:00
Iatots
3dac7e4b43
Update generic_positive_events.dm
2020-07-23 19:44:02 +02:00
timothyteakettle
584e74590f
port1
2020-07-17 02:01:33 +01:00
silicons
8d5d194a26
hahahahaha
2020-07-11 00:30:56 -07:00
Ghom
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
Ghom
3ac61c0704
Porting tg painting code. ( #12305 )
...
* Porting tg painting code.
* yes.
2020-05-20 18:45:36 -07:00
Trilbyspaceclone
3def6b861f
Update drink_events.dm
2020-04-14 20:04:18 -04:00
Trilbyspaceclone
c4f951b80b
Tho it IS ment to be 6 not 10
2020-04-14 19:35:23 -04:00
TrilbySpaceClone
79a72a50d4
this is annoying, why is angel not defind as a race
2020-04-14 11:13:49 -04:00
Artur
35aecac620
Disgust mood for bloodsuckers being disgusted, and blood bag inneficency
2020-02-20 12:50:25 +02:00
Artur
1bf2a3e7ca
Initial Commit
2020-01-30 17:28:02 +01:00
keronshb
69b5164103
Merge branch 'master' into RemoteMoodResearch
2020-01-16 15:50:11 -05:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
keronshb
a7af5203e7
This is a test to see if they all work together
...
Title
2020-01-06 20:29:44 -05:00
Ghommie
8c7b648a4f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425
2020-01-05 17:42:54 +01:00
Trilbyspaceclone
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
Useroth
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
Artur
9faf3d1dac
Mooaar fixeees
2019-12-14 01:01:38 +02:00
Artur
9773b530f8
More fixes. Urgh
2019-12-08 21:47:25 +02:00
Useroth
a37f2de71d
First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs.
2019-12-08 14:00:08 +01:00
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
TrilbySpaceClone
c4450579ac
Why does breakfast have a timer?
...
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
2019-12-07 01:53:55 -05:00
Artur
19ab4a5f70
Review fixes and tweaks
2019-12-07 00:43:02 +02:00
Ghommie
77ef3dabea
Demodularize moodlets.
2019-12-04 23:10:39 +01:00
Ghommie
c25508f1c2
turns dog/cat petting into an element.
2019-12-04 20:18:03 +01:00
Ghommie
a5b37b658b
Purging a lot of space indention in favor of tabs.
2019-10-29 15:46:31 +01:00
Ghommie
3d0cb39e91
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured.
2019-09-22 18:42:47 +02:00
Thalpy
696d879874
Merge branch 'master' into master
2019-06-29 15:48:25 +01:00
kevinz000
c495a2aa47
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
...
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
Fermi
10109d0fe5
Merge branch 'pr/18'
2019-06-23 19:15:07 +01:00
Sishen
a2a440a92c
golem gang golem gang golem gang golem gang
2019-06-23 04:27:50 -04:00
Fermi
21c17813b8
Guess who should've compile tested!
2019-06-23 01:20:11 +01:00
Ghommie
50dd512be7
Ports system for randomized semi-persistent chem reactions.
2019-06-17 10:50:40 +02:00
Fermi
6b9becce71
Merge branch 'pr/14'
2019-06-14 21:29:04 +01:00
Fermi
281c0ce582
Reduced happiness mood effects.
2019-06-13 01:02:39 +01:00
Fermi
0eec1ed3f3
Pooj changes.
2019-06-02 22:49:04 +01:00
Fermi
a3e60843bc
Renamed blood trait and spelt minutes right.
2019-06-02 22:35:16 +01:00
Fermi
4513dd9815
MINUTE define changes.
2019-06-02 22:26:53 +01:00
Fermi
5918b026aa
Fixes, PLEASE CHECK HEADPATS IN MOODULAR.
2019-06-01 20:02:51 +01:00
Fermi
f8586c9699
Adds Friendly and empahty quirk from tg.
2019-06-01 18:51:25 +01:00
Fermi
ee2d75ae22
Removed special screen obj, as I didn't like how they looked.
2019-05-30 20:05:06 +01:00
Thalpy
af80bf3204
MINUTE defines.
2019-05-29 18:41:51 +01:00
Fermi
91f10442cf
Merge branch 'pr/12'
2019-05-26 02:05:48 +01:00
Fermi
f7655cad25
All compiling errors fixed, except for a few weird ones that I need help
2019-05-11 15:40:06 +01:00
