 kevinz000
|
2e90761f88
|
Merge pull request #11482 from Ghommie/Ghommie-cit624
fixing missing icon issues for some survival pod machinery.
|
2020-03-16 13:23:06 -07:00 |
|
|
kevinz000
|
fd7bfaba06
|
Merge pull request #11480 from Ghommie/Ghommie-cit623
Banana pies, beams. runtime errors and warnings.
|
2020-03-16 13:22:49 -07:00 |
|
|
CitadelStationBot
|
b4338a81b0
|
Automatic changelog generation for PR #11483 [ci skip]
|
2020-03-16 15:22:26 -05:00 |
|
|
kevinz000
|
3c97782a87
|
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
mining borg nerfs - "they should be outclassed lategame"
|
2020-03-16 13:22:23 -07:00 |
|
|
CitadelStationBot
|
4953b5e23f
|
Automatic changelog generation for PR #11496 [ci skip]
|
2020-03-16 11:20:54 -05:00 |
|
|
Seris02
|
ffb2e65c17
|
why I hate byond (#11496)
|
2020-03-16 17:20:51 +01:00 |
|
|
CitadelStationBot
|
2370105ccb
|
Automatic changelog generation for PR #11488 [ci skip]
|
2020-03-16 10:23:14 -05:00 |
|
|
bunny232
|
faa5a93510
|
Fixed missing pipe by box vault (#11488)
* Update BoxStation.dmm
* Update BoxStation.dmm
|
2020-03-16 16:23:11 +01:00 |
|
|
CitadelStationBot
|
fabcbd306c
|
Automatic changelog generation for PR #11465 [ci skip]
|
2020-03-16 08:12:43 -05:00 |
|
|
kevinz000
|
8fdb1e5964
|
Merge pull request #11465 from Seris02/duffelbagholding
duffel bags of holding
|
2020-03-16 06:12:40 -07:00 |
|
|
Seris02
|
b8e8a81d1c
|
there
|
2020-03-16 20:49:10 +08:00 |
|
|
Hatterhat
|
1fe67d5ce9
|
a finger of the monkey's paw curls.
|
2020-03-16 01:35:47 -05:00 |
|
|
CitadelStationBot
|
c08f264dd2
|
Automatic changelog generation for PR #11462 [ci skip]
|
2020-03-16 01:04:04 -05:00 |
|
|
kevinz000
|
fae84f9ee6
|
Merge pull request #11462 from Ghommie/Ghommie-cit621
Fixing some bug reports.
|
2020-03-15 23:03:59 -07:00 |
|
|
CitadelStationBot
|
1f77a95365
|
Automatic changelog generation for PR #11474 [ci skip]
|
2020-03-16 01:03:12 -05:00 |
|
|
kevinz000
|
f927793118
|
Merge pull request #11474 from kappa-sama/patch-17
halves the firebeath mutation's cooldown to 1 minute from 2 minutes
|
2020-03-15 23:03:10 -07:00 |
|
|
CitadelStationBot
|
5ec23eac8c
|
Automatic changelog generation for PR #11472 [ci skip]
|
2020-03-16 01:02:45 -05:00 |
|
|
kevinz000
|
d083d029b2
|
Merge pull request #11472 from zeroisthebiggay/brigmedbayssaltpr
Mission Objective Powergame Brig (box station brig rework)
|
2020-03-15 23:02:43 -07:00 |
|
|
CitadelStationBot
|
80be870ebf
|
Automatic changelog generation for PR #11475 [ci skip]
|
2020-03-15 19:57:57 -05:00 |
|
|
Seris02
|
259bb03969
|
fixes the swapping of buttons (#11475)
|
2020-03-16 01:57:55 +01:00 |
|
|
Hatterhat
|
802d37a399
|
borgs should be outclassed lategame and not hunt
|
2020-03-15 15:55:31 -05:00 |
|
|
ZeroMan
|
8da4521a91
|
and i hate lawyers
|
2020-03-15 16:16:49 -04:00 |
|
|
CitadelStationBot
|
9a0f43cb89
|
Automatic changelog generation for PR #11477 [ci skip]
|
2020-03-15 14:54:26 -05:00 |
|
|
kevinz000
|
339ea13e00
|
Update beam_rifle.dm (#11477)
|
2020-03-15 20:54:23 +01:00 |
|
|
Ghommie
|
0ce0265420
|
fixing missing icons for survival pod machinery.
|
2020-03-15 20:47:37 +01:00 |
|
|
kevinz000
|
28a8f204ed
|
Merge pull request #11479 from Ghommie/Ghommie-cit622
Fixing some GetElement runtimes.
|
2020-03-15 10:39:36 -07:00 |
|
|
ZeroMan
|
d1651e44cd
|
Merge branch 'brigmedbayssaltpr' of https://github.com/zeroisthebiggay/Citadel-Station-13 into brigmedbayssaltpr
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
|
2020-03-15 13:04:56 -04:00 |
|
|
ZeroMan
|
6968e94b06
|
and maybe it works
|
2020-03-15 12:58:33 -04:00 |
|
|
ZeroMan
|
a1f4c0232e
|
a i wanna die
|
2020-03-15 12:57:55 -04:00 |
|
|
ZeroMan
|
326602bc5a
|
and renault breaks everything
|
2020-03-15 12:40:53 -04:00 |
|
|
ZeroMan
|
4341ecf168
|
and maybe travis dies
|
2020-03-15 12:16:59 -04:00 |
|
|
ZeroMan
|
715d199073
|
i am so confused
|
2020-03-15 12:16:30 -04:00 |
|
|
ZeroMan
|
227372270e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr
|
2020-03-15 12:13:51 -04:00 |
|
|
ZeroMan
|
107a9fa2d2
|
and map merge exists
|
2020-03-15 11:29:49 -04:00 |
|
|
ZeroMan
|
82b63081f6
|
a couple more tweaks
|
2020-03-15 11:28:57 -04:00 |
|
|
Ghom
|
4020c67956
|
Update snacks_pie.dm
|
2020-03-15 16:16:28 +01:00 |
|
|
Ghommie
|
b453a25e14
|
Something about banana pies, runtime errors and warnings.
|
2020-03-15 15:41:32 +01:00 |
|
|
Ghommie
|
5bfbcd0948
|
Fixing some GetElement runtimes.
|
2020-03-15 15:12:35 +01:00 |
|
|
kevinz000
|
b7c3ada3e5
|
nuclear fixes the blindness issue by making eye_blind() max() rather than add (#11438)
* Update status_procs.dm
* Update status_procs.dm
* travis
* aight bet
|
2020-03-15 13:08:52 +01:00 |
|
|
Ghom
|
d8a6e9b94f
|
Merge branch 'master' into Ghommie-cit621
|
2020-03-15 13:07:45 +01:00 |
|
|
CitadelStationBot
|
685485acf9
|
Automatic changelog generation for PR #11290 [ci skip]
|
2020-03-15 03:35:34 -05:00 |
|
|
kevinz000
|
2139bfdb5f
|
Merge pull request #11290 from Putnam3145/traitor-types
Traitor classes: a new paradigm.
|
2020-03-15 01:35:30 -07:00 |
|
|
ZeroMan
|
edb63ed212
|
and torture my cocknballs
|
2020-03-15 01:50:40 -04:00 |
|
|
ZeroMan
|
7affa9956e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr
|
2020-03-15 01:37:26 -04:00 |
|
|
ZeroMan
|
74076eb351
|
and maybe thisll work
|
2020-03-15 01:23:23 -04:00 |
|
|
CitadelStationBot
|
f91d30dae5
|
Automatic changelog generation for PR #11455 [ci skip]
|
2020-03-15 00:22:18 -05:00 |
|
|
kevinz000
|
0b809dd9ec
|
Merge pull request #11455 from Trilbyspaceclone/patch-309
Nerfs paper work - Again
|
2020-03-14 22:22:16 -07:00 |
|
|
CitadelStationBot
|
46d05053fd
|
Automatic changelog generation for PR #11458 [ci skip]
|
2020-03-15 00:21:34 -05:00 |
|
|
kevinz000
|
195a3b593b
|
Merge pull request #11458 from Trilbyspaceclone/patch-310
Buffs borg hypos - Anti-radiation addition
|
2020-03-14 22:21:32 -07:00 |
|
|
kevinz000
|
a6cec97694
|
Merge pull request #11459 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/minimist-1.2.2
Bump minimist from 1.2.0 to 1.2.2 in /tgui
|
2020-03-14 22:20:55 -07:00 |
|