Putnam3145
|
6fffb4045b
|
Make mass hallucination more admemeable (#11491)
* Make mass hallucination more admemeable
* makes it work
* Update code/modules/events/mass_hallucination.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-20 16:08:11 +01:00 |
|
Ghom
|
6e9aff97ae
|
b
|
2020-03-19 01:44:28 +01:00 |
|
Ghommie
|
3aa3ed189a
|
gunz
|
2020-03-18 23:53:10 +01:00 |
|
Ghommie
|
0285b4cee4
|
> virtual gf
|
2020-03-18 23:49:19 +01:00 |
|
Ghom
|
9e3a3dddfd
|
Merge pull request #11429 from Putnam3145/dynamic-tweaks
Dynamic tweaks/fixes
|
2020-03-12 14:20:28 +01:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|
Putnam
|
8db3a3ced4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks
|
2020-03-11 02:17:16 -07:00 |
|
Putnam
|
621ea62d64
|
Added swarmers, portal storm, wormholes to dynamic.
|
2020-03-10 23:21:47 -07:00 |
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
Ghommie
|
ad4d290ea7
|
WIP
|
2020-03-08 19:26:01 +01:00 |
|
Kraseo
|
ad20fb1a0e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-06 11:58:11 +01:00 |
|
Kraseo
|
e3c77f2f5a
|
part 4: the one where i slowly go insane
|
2020-03-01 22:05:35 +01:00 |
|
Ghommie
|
c0ff43f827
|
ofc, New arguments.
|
2020-03-01 16:34:43 +01:00 |
|
bunny232
|
53d5328c0c
|
Update sentience.dm
|
2020-02-24 18:49:34 -05:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
Detective Google
|
141bd96430
|
man FUCK psychs
|
2020-02-20 22:46:37 -06:00 |
|
Detective Google
|
4c10c830bf
|
Merge remote-tracking branch 'upstream/master' into psych+paramedic
|
2020-02-20 22:17:55 -06:00 |
|
Detective Google
|
a8f863f901
|
changes - sprites
|
2020-02-20 22:17:47 -06:00 |
|
Ghom
|
ad639d5f2f
|
Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7
!tgs valentine
|
2020-02-15 09:04:29 +01:00 |
|
Seris02
|
2d9c8ce8fc
|
fixing merge conflicts
|
2020-02-15 15:41:52 +08:00 |
|
kevinz000
|
4677bd47be
|
Update vday.dm
|
2020-02-14 00:39:29 -07:00 |
|
kevinz000
|
94c6fae838
|
Update vday.dm
|
2020-02-13 21:27:44 -07:00 |
|
kevinz000
|
b8d18758d1
|
Update vday.dm
|
2020-02-13 20:33:18 -07:00 |
|
Artur
|
7964d768fa
|
Initial Commit
|
2020-02-13 20:51:52 +02:00 |
|
kevinz000
|
c29e0e1a1d
|
Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
|
2020-02-10 04:16:14 -07:00 |
|
Ghom
|
0d37700836
|
Merge pull request #10926 from keronshb/PirateBombProof
Buffs the Pirate Ship to be bomb resistant
|
2020-02-10 08:40:10 +01:00 |
|
r4d6
|
49f2993c59
|
Correct timer
|
2020-02-08 23:09:51 -05:00 |
|
r4d6
|
10490e1c15
|
3 minutes it is
|
2020-02-05 21:03:34 -05:00 |
|
r4d6
|
8430ee3684
|
Timer 2-5 minutes
|
2020-02-05 20:58:26 -05:00 |
|
keronshb
|
5d1d652ea4
|
Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health. It also allows turrets to be repairable now.
|
2020-02-05 18:28:00 -05:00 |
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08:00 |
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
Seris02
|
8f70bd304d
|
yee
|
2020-02-04 13:24:30 +08:00 |
|
Seris02
|
659110ac8c
|
yee again
|
2020-02-02 13:44:45 +08:00 |
|
Seris02
|
4c2e702d7a
|
yee
|
2020-02-02 13:18:26 +08:00 |
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
Ghom
|
44c141f009
|
Merge branch 'master' into hugbox_meteor_time
|
2020-01-29 02:28:12 +01:00 |
|
kevinz000
|
54f9df9f88
|
;GUYS WHERE'S PORT I KEEP FORGETTING MY DIRECTIONS
|
2020-01-27 13:19:53 -07:00 |
|
Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
kevinz000
|
f842a249a4
|
Update meteor_wave.dm
|
2020-01-25 22:11:49 -07:00 |
|
kevinz000
|
d7ba4134e1
|
Update meteor_wave.dm
|
2020-01-25 22:10:39 -07:00 |
|
kevinz000
|
8b4a050ad3
|
ok
|
2020-01-25 22:03:53 -07:00 |
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
Trilbyspaceclone
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
Seris02
|
74be93a8cc
|
hasSiliconAccessInArea vars change
|
2020-01-21 11:44:49 +08:00 |
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
Seris02
|
04b34ec8ed
|
hijack implant
|
2020-01-18 18:04:31 +08:00 |
|
TrilbySpaceClone
|
92dc5e61c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
|
2020-01-13 03:42:20 -05:00 |
|
Seris02
|
16b5c83a3a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-13 12:53:52 +08:00 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|