kingofkosmos
|
63122795f9
|
Adds missing span-endings
|
2017-09-11 07:10:09 -05:00 |
|
msgerbs
|
3ceb70f84d
|
Fix crit-only healing to include softcrit (#30520)
With softcrit implemented, people are only unconcious in hard crit. This will no longer bring you out of crit as intended. This PR fixes that.
|
2017-09-09 16:29:36 -05:00 |
|
LetterJay
|
00199af27d
|
Merge branch 'master' into upstream-merge-29866
|
2017-09-06 09:21:53 -05:00 |
|
kevinz000
|
28ea6f3ad2
|
Merge pull request #2499
|
2017-08-29 22:43:54 -07:00 |
|
kevinz000
|
cf93e511ce
|
Merge pull request #2527
|
2017-08-29 22:40:02 -07:00 |
|
kevinz000
|
8693a933b4
|
Merge pull request #2482
|
2017-08-29 22:27:42 -07:00 |
|
kevinz000
|
9cb65df70d
|
Merge pull request #2426
|
2017-08-29 22:27:21 -07:00 |
|
kevinz000
|
fcddd32703
|
Merge pull request #2195
|
2017-08-29 22:26:58 -07:00 |
|
kevinz000
|
408acdd66d
|
sync
|
2017-08-29 22:05:16 -07:00 |
|
kevinz000
|
ec2993289e
|
sync
|
2017-08-29 20:07:36 -07:00 |
|
kevinz000
|
1b0bbb8c86
|
Merge branch 'master' into upstream-merge-30113
|
2017-08-29 20:02:14 -07:00 |
|
kevinz000
|
3f16272717
|
line endings ree
|
2017-08-29 19:57:58 -07:00 |
|
kevinz000
|
5f5065eb46
|
kek
|
2017-08-29 09:59:57 -07:00 |
|
kevinz000
|
064ade469f
|
sync
|
2017-08-29 09:35:55 -07:00 |
|
kevinz000
|
498bd61928
|
sync
|
2017-08-29 09:12:56 -07:00 |
|
LetterJay
|
6c76ae2395
|
clean up
|
2017-08-28 10:34:31 -05:00 |
|
LetterJay
|
29de038837
|
Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162
[MIRROR] Gives plasmamen hallucinations when taking blackpowder
|
2017-08-28 08:54:01 -05:00 |
|
kevinz000
|
3254fcf535
|
goddamnit_again (#2511)
|
2017-08-26 18:43:57 -07:00 |
|
CitadelStationBot
|
cd11c01c42
|
Adds magillitis, a traitor serum for geneticists & CMOs
|
2017-08-26 11:07:42 -05:00 |
|
CitadelStationBot
|
b151209160
|
Gives plasmamen hallucinations when taking blackpowder
|
2017-08-26 11:07:33 -05:00 |
|
LetterJay
|
188193eb61
|
here we go again (#2456)
|
2017-08-24 19:24:25 -07:00 |
|
kevinz000
|
35b7b93b24
|
ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
|
2017-08-22 05:01:38 -07:00 |
|
kevinz000
|
6a309b5996
|
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
|
2017-08-22 04:04:21 -07:00 |
|
LetterJay
|
b01a24c95b
|
my eyes hurt
|
2017-08-22 01:42:20 -05:00 |
|
LetterJay
|
a0cf777040
|
Merge branch 'master' into upstream-merge-29940
|
2017-08-21 23:29:24 -05:00 |
|
CitadelStationBot
|
4961966552
|
|SPECIES FOOD PREFERENCES| (#2232)
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
|
2017-08-21 20:23:30 -07:00 |
|
LetterJay
|
ae9e4495f9
|
Merge branch 'master' into upstream-merge-29747
|
2017-08-20 09:53:17 -05:00 |
|
CitadelStationBot
|
5eea016593
|
You can now click on symptoms in the Pandemic to see their description and stats
|
2017-08-19 18:52:55 -05:00 |
|
CitadelStationBot
|
f7bde6a76a
|
Makes mixing meth dangerous again
|
2017-08-18 18:59:58 -05:00 |
|
CitadelStationBot
|
87b3df3069
|
Replace all secondary flags with bitflags stored in the flags_2 var
|
2017-08-17 09:19:14 -05:00 |
|
CitadelStationBot
|
9176bbc129
|
Removes meth explosion syringes
|
2017-08-16 17:59:48 -05:00 |
|
LetterJay
|
0ffaf66d1f
|
Merge branch 'master' into upstream-merge-29690
|
2017-08-15 19:18:22 -05:00 |
|
CitadelStationBot
|
3d83b55cf6
|
Annihilates the colons!
|
2017-08-15 10:49:55 -05:00 |
|
LetterJay
|
69bf7e42cf
|
Merge branch 'master' into upstream-merge-29288
|
2017-08-14 18:35:28 -05:00 |
|
CitadelStationBot
|
bd35823012
|
[ready]Makes bIcon better
|
2017-08-13 17:41:12 -05:00 |
|
CitadelStationBot
|
4d19a89519
|
Removes a great amount of machinery copypasta with circuitboards.
|
2017-08-09 19:24:19 -05:00 |
|
CitadelStationBot
|
7e539bfe3b
|
Fixes Explosive Lattice blobs being way more fragile than they should be
|
2017-08-06 18:02:40 -05:00 |
|
CitadelStationBot
|
dd22c79678
|
Completes major inhand split project (#2178)
|
2017-08-02 06:30:33 -05:00 |
|
CitadelStationBot
|
55f1de10a6
|
Spellchecking
|
2017-08-01 08:46:20 -05:00 |
|
kevinz000
|
bbcad2fa58
|
Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"
This reverts commit 44742cb115.
* Delete shuttle_loan.dm.rej
* Delete life.dm.rej
* Update life.dm
* Delete life.dm.rej
* compile
|
2017-07-31 23:41:22 -07:00 |
|
ktccd
|
aa5ce7ebb1
|
Merge pull request #2166 from Citadel-Station-13/upstream-merge-29540
[MIRROR] Fixes mutation toxins not stunning properly
|
2017-07-31 21:46:03 +02:00 |
|
LetterJay
|
35fba1933e
|
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
|
2017-07-31 03:43:03 -05:00 |
|
CitadelStationBot
|
79e6963aca
|
Hallucinations 3.0
|
2017-07-30 19:58:28 -05:00 |
|
CitadelStationBot
|
edf7c03070
|
Multiple inhand sprites fix
|
2017-07-30 19:58:18 -05:00 |
|
CitadelStationBot
|
5da5e58ee5
|
Fixes a lot of eye damage procs
|
2017-07-30 08:16:38 -05:00 |
|
CitadelStationBot
|
2d82262e50
|
Fixes syringes being unable to inject at all if the target has thick clothing on any slot (#2184)
|
2017-07-29 19:50:37 -07:00 |
|
CitadelStationBot
|
e3334ad1a8
|
Fixes mutation toxins not stunning properly
|
2017-07-28 09:02:02 -05:00 |
|
CitadelStationBot
|
7ce6be92a0
|
Virology fixes (#2097)
|
2017-07-24 04:08:07 -07:00 |
|
CitadelStationBot
|
5dc1120b2f
|
Calling the base on_mob_life is mandatory (#2083)
|
2017-07-20 06:31:10 -07:00 |
|
LetterJay
|
85f1b25bcd
|
Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
|
2017-07-19 06:29:06 -05:00 |
|